Index: head/lang/ocaml/files/patch-configure =================================================================== --- head/lang/ocaml/files/patch-configure (revision 385270) +++ head/lang/ocaml/files/patch-configure (revision 385271) @@ -1,54 +1,65 @@ --- configure.orig 2014-10-03 19:25:46 UTC +++ configure +@@ -85,10 +85,6 @@ exec 3>&1 + + # Parse command-line arguments + +-if echo "$configure_options" | grep -q -e '--\?[a-zA-Z0-9-]\+='; then +- err "Arguments to this script look like '-prefix /foo/bar', not '-prefix=/foo/bar' (note the '=')." +-fi +- + while : ; do + case "$1" in + "") break;; @@ -659,7 +659,8 @@ if test $with_sharedlibs = "yes"; then mksharedlib="$flexlink" mkmaindll="$flexlink -maindll" shared_libraries_supported=true;; - *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-freebsd[1-9][0-9]*|*-*-openbsd*|*-*-netbsd*|*-*-gnu*|*-*-haiku*) + *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-freebsd[1-9][0-9]*| \ + *-*-dragonfly*|*-*-openbsd*|*-*-netbsd*|*-*-gnu*|*-*-haiku*) sharedcccompopts="-fPIC" mksharedlib="$bytecc -shared" bytecclinkopts="$bytecclinkopts -Wl,-E" @@ -766,6 +767,7 @@ if test $with_sharedlibs = "yes"; then x86_64-*-kfreebsd*) natdynlink=true;; i[3456]86-*-freebsd*) natdynlink=true;; x86_64-*-freebsd*) natdynlink=true;; + x86_64-*-dragonfly*) natdynlink=true;; i[3456]86-*-openbsd*) natdynlink=true;; x86_64-*-openbsd*) natdynlink=true;; i[3456]86-*-netbsd*) natdynlink=true;; @@ -833,6 +835,7 @@ case "$target" in zaurus*-*-openbsd*) arch=arm; system=bsd;; x86_64-*-linux*) arch=amd64; system=linux;; x86_64-*-gnu*) arch=amd64; system=gnu;; + x86_64-*-dragonfly*) arch=amd64; system=dragonfly;; x86_64-*-freebsd*) arch=amd64; system=freebsd;; x86_64-*-netbsd*) arch=amd64; system=netbsd;; x86_64-*-openbsd*) arch=amd64; system=openbsd;; @@ -905,6 +908,8 @@ case "$arch,$system" in aspp="${TOOLPREF}cc -c";; *,freebsd) as="${TOOLPREF}as" aspp="${TOOLPREF}cc -c";; + *,dragonfly) as="as" + aspp="cc -c";; amd64,*|arm,*|arm64,*|i386,*|power,bsd*|sparc,*) as="${TOOLPREF}as" aspp="${TOOLPREF}gcc -c";; @@ -1390,7 +1395,7 @@ if test "$pthread_wanted" = "yes"; then bytecccompopts="$bytecccompopts -D_REENTRANT" nativecccompopts="$nativecccompopts -D_REENTRANT" case "$target" in - *-*-freebsd*) + *-*-freebsd*|*-*-dragonfly*) bytecccompopts="$bytecccompopts -D_THREAD_SAFE" nativecccompopts="$nativecccompopts -D_THREAD_SAFE";; *-*-openbsd*) @@ -1560,6 +1565,7 @@ if test "$x11_include" = "not found"; th else x11_libs="-L$dir" case "$target" in + *-*-freebsd*|*-*-dragonfly*) x11_link="-L$dir -lX11";; *-kfreebsd*-gnu) x11_link="-L$dir -lX11";; *-*-*bsd*) x11_link="-R$dir -L$dir -lX11";; *) x11_link="-L$dir -lX11";;