Attachment #161768 for bug #203589

View | Details | Raw Unified | Return to bug 203589
Collapse All | Expand All

Lines 3-9 Link Here

(-)Makefile (-1 / +1 lines)
3	# for committer: bump PORTREVISION for math/facile whenever ocaml gets updated	3	# for committer: bump PORTREVISION for math/facile whenever ocaml gets updated
4		4
5	PORTNAME= ocaml	5	PORTNAME= ocaml
6	PORTVERSION= 4.02.1	6	PORTVERSION= 4.02.3
7	CATEGORIES= lang	7	CATEGORIES= lang
8	MASTER_SITES= http://caml.inria.fr/pub/distrib/${DISTNAME:R}/ GENTOO \	8	MASTER_SITES= http://caml.inria.fr/pub/distrib/${DISTNAME:R}/ GENTOO \
9	http://caml.inria.fr/pub/distrib/${DISTNAME:R}/:docs	9	http://caml.inria.fr/pub/distrib/${DISTNAME:R}/:docs

Lines 1-5 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (ocaml-4.02.1.tar.xz) = 68c4b01be54c23bc20fc0a8beaa5c7433b8483f8950490129cfe7662e0c6f4dc	1	SHA256 (ocaml-4.02.3.tar.xz) = 83c6697e135b599a196fd7936eaf8a53dd6b8f3155a796d18407b56f91df9ce3
2	SIZE (ocaml-4.02.1.tar.xz) = 2031244	2	SIZE (ocaml-4.02.3.tar.xz) = 2058552
3	SHA256 (ocaml-4.02-refman-html.tar.gz) = 1d3b7e5494c075d86c760f6320acba086d686e7409cb75f8267bccfb6ad5f3a8	3	SHA256 (ocaml-4.02-refman-html.tar.gz) = 1d3b7e5494c075d86c760f6320acba086d686e7409cb75f8267bccfb6ad5f3a8
4	SIZE (ocaml-4.02-refman-html.tar.gz) = 612839	4	SIZE (ocaml-4.02-refman-html.tar.gz) = 612839
5	SHA256 (ocaml-4.02-refman.ps.gz) = b14b5aec1e4e1aded2d36e78ceeedfc3c19c3369b257ab507f6a0755651e8f4a	5	SHA256 (ocaml-4.02-refman.ps.gz) = b14b5aec1e4e1aded2d36e78ceeedfc3c19c3369b257ab507f6a0755651e8f4a




--- configure.orig	2015-05-12 16:46:37.000000000 +0200
+++ configure	2015-10-06 19:43:20.732189000 +0200
@@ -446,7 +446,7 @@
 
 # Configure compiler to use in further tests
 
-cc="$bytecc -O $bytecclinkopts"
+cc="$bytecc $bytecclinkopts"
 export cc cclibs verbose
 
 # Check C compiler
@@ -690,7 +690,7 @@
     "") 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"
+      mksharedlib="$bytecc $bytecclinkopts -shared"
       bytecclinkopts="$bytecclinkopts -Wl,-E"
       byteccrpath="-Wl,-rpath,"
       mksharedlibrpath="-Wl,-rpath,"
@@ -700,7 +700,7 @@
       case "$bytecc" in
         *gcc*)
           sharedcccompopts="-fPIC"
-          mksharedlib="$bytecc -shared"
+          mksharedlib="$bytecc $bytecclinkopts -shared"
           byteccrpath="-Wl,-rpath,"
           mksharedlibrpath="-Wl,-rpath,"
           shared_libraries_supported=true;;
@@ -716,11 +716,11 @@
         *gcc*)
           sharedcccompopts="-fPIC"
           if sh ./solaris-ld; then
-            mksharedlib="$bytecc -shared"
+            mksharedlib="$bytecc $bytecclinkopts -shared"
             byteccrpath="-R"
             mksharedlibrpath="-R"
           else
-            mksharedlib="$bytecc -shared"
+            mksharedlib="$bytecc $bytecclinkopts -shared"
             bytecclinkopts="$bytecclinkopts -Wl,-E"
             natdynlinkopts="-Wl,-E"
             byteccrpath="-Wl,-rpath,"
@@ -744,12 +744,12 @@
       mksharedlibrpath="-rpath "
       shared_libraries_supported=true;;
     i[3456]86-*-darwin[89].*)
-      mksharedlib="$bytecc -bundle -flat_namespace -undefined suppress -read_only_relocs suppress"
+      mksharedlib="$bytecc $bytecclinkopts -bundle -flat_namespace -undefined suppress -read_only_relocs suppress"
       bytecccompopts="$dl_defs $bytecccompopts"
       dl_needs_underscore=false
       shared_libraries_supported=true;;
     *-apple-darwin*)
-      mksharedlib="$bytecc -bundle -flat_namespace -undefined suppress -Wl,-no_compact_unwind"
+      mksharedlib="$bytecc $bytecclinkopts -bundle -flat_namespace -undefined suppress -Wl,-no_compact_unwind"
       bytecccompopts="$dl_defs $bytecccompopts"
       dl_needs_underscore=false
       shared_libraries_supported=true;;
@@ -759,7 +759,7 @@
       shared_libraries_supported=false;;
     *-*-openbsd*)
       sharedcccompopts="-fPIC"
-      mksharedlib="$bytecc -shared"
+      mksharedlib="$bytecc $bytecclinkopts -shared"
       bytecclinkopts="$bytecclinkopts -Wl,-E"
       natdynlinkopts="-Wl,-E"
       byteccrpath="-Wl,-rpath,"
@@ -889,7 +889,7 @@
 fi
 
 nativecccompopts=''
-nativecclinkopts=''
+nativecclinkopts=""
 # FIXME the naming of nativecclinkopts is broken: these are options for
 # ld (for shared libs), not for cc
 nativeccrpath="$byteccrpath"
@@ -1601,6 +1601,7 @@
       else
         x11_libs="-L$dir"
         case "$target" in

           *-kfreebsd*-gnu) x11_link="-L$dir -lX11";;
           *-*-*bsd*) x11_link="-R$dir -L$dir -lX11";;
           *) x11_link="-L$dir -lX11";;
@@ -1644,10 +1645,10 @@
 # Look for BFD library
 
 if sh ./hasgot -DPACKAGE=ocaml -i bfd.h && \
-   sh ./hasgot -DPACKAGE=ocaml -lbfd -ldl -liberty -lz bfd_openr; then
+   sh ./hasgot -DPACKAGE=ocaml -lbfd $dllib -liberty -lz bfd_openr; then
   inf "BFD library found."
   echo "#define HAS_LIBBFD" >> s.h
-  echo "LIBBFD_LINK=-lbfd -ldl -liberty -lz" >> Makefile
+  echo "LIBBFD_LINK=-lbfd $dllib -liberty -lz" >> Makefile
 else
   wrn "BFD library not found, 'objinfo' will be unable to display info on .cmxs files."
   echo "LIBBFD_LINK=" >> Makefile
@@ -1686,12 +1687,6 @@
   echo "#define NO_NAKED_POINTERS" >> m.h
 fi
 
-# Add Unix-style optimization flag
-bytecccompopts="-O $bytecccompopts"
-dllcccompopts="-O $dllcccompopts"
-nativecccompopts="-O $nativecccompopts"
-sharedcccompopts="-O $sharedcccompopts"
-
 # Final twiddling of compiler options to work around known bugs
 
 nativeccprofopts="$nativecccompopts"

Return to bug 203589

Lines 1-75 Link Here

(-)files/patch-configure (-67 / +98 lines)
1	--- configure.orig 2014-10-03 19:25:46 UTC	1	--- configure.orig 2015-05-12 16:46:37.000000000 +0200
2	+++ configure	2	+++ configure 2015-10-06 19:43:20.732189000 +0200
3	@@ -85,10 +85,6 @@ exec 3>&1	3	@@ -446,7 +446,7 @@
4		4
5	# Parse command-line arguments	5	# Configure compiler to use in further tests
6		6
7	-if echo "$configure_options" \| grep -q -e '--\?[a-zA-Z0-9-]\+='; then	7	-cc="$bytecc -O $bytecclinkopts"
8	- err "Arguments to this script look like '-prefix /foo/bar', not '-prefix=/foo/bar' (note the '=')."	8	+cc="$bytecc $bytecclinkopts"
9	-fi	9	export cc cclibs verbose
10	-	10
11	while : ; do	11	# Check C compiler
12	case "$1" in	12	@@ -690,7 +690,7 @@
13	"") break;;
14	@@ -659,7 +659,8 @@ if test $with_sharedlibs = "yes"; then
15	mksharedlib="$flexlink"
16	mkmaindll="$flexlink -maindll"
17	shared_libraries_supported=true;;	13	shared_libraries_supported=true;;
18	- --linux-gnu\|--linux\|--freebsd[3-9]\|--freebsd[1-9][0-9]\|--openbsd\|--netbsd\|--gnu\|--haiku)	14	--linux-gnu\|--linux\|--freebsd[3-9]\|--freebsd[1-9][0-9]\|--openbsd\|--netbsd\|--gnu\|--haiku)
19	+ --linux-gnu\|--linux\|--freebsd[3-9]\|--freebsd[1-9][0-9]\| \
20	+ --dragonfly\|--openbsd\|--netbsd\|--gnu\|--haiku*)
21	sharedcccompopts="-fPIC"	15	sharedcccompopts="-fPIC"
22	mksharedlib="$bytecc -shared"	16	- mksharedlib="$bytecc -shared"
		17	+ mksharedlib="$bytecc $bytecclinkopts -shared"
23	bytecclinkopts="$bytecclinkopts -Wl,-E"	18	bytecclinkopts="$bytecclinkopts -Wl,-E"
24	@@ -761,11 +758,13 @@ if test $with_sharedlibs = "yes"; then	19	byteccrpath="-Wl,-rpath,"
25	fi;;	20	mksharedlibrpath="-Wl,-rpath,"
26	x86_64--darwin) natdynlink=true;;	21	@@ -700,7 +700,7 @@
27	powerpc--linux*) natdynlink=true;;	22	case "$bytecc" in
28	+ powerpc--freebsd*) natdynlink=true;;	23	gcc)
29	sparc--linux*) natdynlink=true;;	24	sharedcccompopts="-fPIC"
30	i686--kfreebsd) natdynlink=true;;	25	- mksharedlib="$bytecc -shared"
31	x86_64--kfreebsd) natdynlink=true;;	26	+ mksharedlib="$bytecc $bytecclinkopts -shared"
32	i[3456]86--freebsd) natdynlink=true;;	27	byteccrpath="-Wl,-rpath,"
33	x86_64--freebsd) natdynlink=true;;	28	mksharedlibrpath="-Wl,-rpath,"
34	+ x86_64--dragonfly) natdynlink=true;;	29	shared_libraries_supported=true;;
35	i[3456]86--openbsd) natdynlink=true;;	30	@@ -716,11 +716,11 @@
36	x86_64--openbsd) natdynlink=true;;	31	gcc)
37	i[3456]86--netbsd) natdynlink=true;;	32	sharedcccompopts="-fPIC"
38	@@ -815,6 +814,7 @@ case "$target" in	33	if sh ./solaris-ld; then
39	i[3456]86--gnu) arch=i386; system=gnu;;	34	- mksharedlib="$bytecc -shared"
40	i[3456]86--mingw) arch=i386; system=mingw;;	35	+ mksharedlib="$bytecc $bytecclinkopts -shared"
41	powerpc--linux*) arch=power; model=ppc; system=elf;;	36	byteccrpath="-R"
42	+ powerpc--freebsd) arch=power; model=ppc; system=bsd_elf;;	37	mksharedlibrpath="-R"
43	powerpc--netbsd) arch=power; model=ppc; system=elf;;	38	else
44	powerpc--openbsd) arch=power; model=ppc; system=bsd_elf;;	39	- mksharedlib="$bytecc -shared"
45	powerpc--rhapsody) arch=power; model=ppc; system=rhapsody;;	40	+ mksharedlib="$bytecc $bytecclinkopts -shared"
46	@@ -833,6 +833,7 @@ case "$target" in	41	bytecclinkopts="$bytecclinkopts -Wl,-E"
47	zaurus--openbsd*) arch=arm; system=bsd;;	42	natdynlinkopts="-Wl,-E"
48	x86_64--linux) arch=amd64; system=linux;;	43	byteccrpath="-Wl,-rpath,"
49	x86_64--gnu) arch=amd64; system=gnu;;	44	@@ -744,12 +744,12 @@
50	+ x86_64--dragonfly) arch=amd64; system=dragonfly;;	45	mksharedlibrpath="-rpath "
51	x86_64--freebsd) arch=amd64; system=freebsd;;	46	shared_libraries_supported=true;;
52	x86_64--netbsd) arch=amd64; system=netbsd;;	47	i[3456]86--darwin[89].)
53	x86_64--openbsd) arch=amd64; system=openbsd;;	48	- mksharedlib="$bytecc -bundle -flat_namespace -undefined suppress -read_only_relocs suppress"
54	@@ -905,6 +908,8 @@ case "$arch,$system" in	49	+ mksharedlib="$bytecc $bytecclinkopts -bundle -flat_namespace -undefined suppress -read_only_relocs suppress"
55	aspp="${TOOLPREF}cc -c";;	50	bytecccompopts="$dl_defs $bytecccompopts"
56	*,freebsd) as="${TOOLPREF}as"	51	dl_needs_underscore=false
57	aspp="${TOOLPREF}cc -c";;	52	shared_libraries_supported=true;;
58	+ *,dragonfly) as="as"	53	-apple-darwin)
59	+ aspp="cc -c";;	54	- mksharedlib="$bytecc -bundle -flat_namespace -undefined suppress -Wl,-no_compact_unwind"
60	amd64,\|arm,\|arm64,\|i386,\|power,bsd\|sparc,)	55	+ mksharedlib="$bytecc $bytecclinkopts -bundle -flat_namespace -undefined suppress -Wl,-no_compact_unwind"
61	as="${TOOLPREF}as"	56	bytecccompopts="$dl_defs $bytecccompopts"
62	aspp="${TOOLPREF}gcc -c";;	57	dl_needs_underscore=false
63	@@ -1390,7 +1395,7 @@ if test "$pthread_wanted" = "yes"; then	58	shared_libraries_supported=true;;
64	bytecccompopts="$bytecccompopts -D_REENTRANT"	59	@@ -759,7 +759,7 @@
65	nativecccompopts="$nativecccompopts -D_REENTRANT"	60	shared_libraries_supported=false;;
66	case "$target" in	61	--openbsd*)
67	- --freebsd*)	62	sharedcccompopts="-fPIC"
68	+ --freebsd\|--dragonfly)	63	- mksharedlib="$bytecc -shared"
69	bytecccompopts="$bytecccompopts -D_THREAD_SAFE"	64	+ mksharedlib="$bytecc $bytecclinkopts -shared"
70	nativecccompopts="$nativecccompopts -D_THREAD_SAFE";;	65	bytecclinkopts="$bytecclinkopts -Wl,-E"
71	--openbsd*)	66	natdynlinkopts="-Wl,-E"
72	@@ -1560,6 +1565,7 @@ if test "$x11_include" = "not found"; th	67	byteccrpath="-Wl,-rpath,"
		68	@@ -889,7 +889,7 @@
		69	fi
		70
		71	nativecccompopts=''
		72	-nativecclinkopts=''
		73	+nativecclinkopts=""
		74	# FIXME the naming of nativecclinkopts is broken: these are options for
		75	# ld (for shared libs), not for cc
		76	nativeccrpath="$byteccrpath"
		77	@@ -1601,6 +1601,7 @@
73	else	78	else
74	x11_libs="-L$dir"	79	x11_libs="-L$dir"
75	case "$target" in	80	case "$target" in
Lines 77-79 Link Here
77	-kfreebsd-gnu) x11_link="-L$dir -lX11";;	82	-kfreebsd-gnu) x11_link="-L$dir -lX11";;
78	--bsd) x11_link="-R$dir -L$dir -lX11";;	83	--bsd) x11_link="-R$dir -L$dir -lX11";;
79	*) x11_link="-L$dir -lX11";;	84	*) x11_link="-L$dir -lX11";;
		85	@@ -1644,10 +1645,10 @@
		86	# Look for BFD library
		87
		88	if sh ./hasgot -DPACKAGE=ocaml -i bfd.h && \
		89	- sh ./hasgot -DPACKAGE=ocaml -lbfd -ldl -liberty -lz bfd_openr; then
		90	+ sh ./hasgot -DPACKAGE=ocaml -lbfd $dllib -liberty -lz bfd_openr; then
		91	inf "BFD library found."
		92	echo "#define HAS_LIBBFD" >> s.h
		93	- echo "LIBBFD_LINK=-lbfd -ldl -liberty -lz" >> Makefile
		94	+ echo "LIBBFD_LINK=-lbfd $dllib -liberty -lz" >> Makefile
		95	else
		96	wrn "BFD library not found, 'objinfo' will be unable to display info on .cmxs files."
		97	echo "LIBBFD_LINK=" >> Makefile
		98	@@ -1686,12 +1687,6 @@
		99	echo "#define NO_NAKED_POINTERS" >> m.h
		100	fi
		101
		102	-# Add Unix-style optimization flag
		103	-bytecccompopts="-O $bytecccompopts"
		104	-dllcccompopts="-O $dllcccompopts"
		105	-nativecccompopts="-O $nativecccompopts"
		106	-sharedcccompopts="-O $sharedcccompopts"
		107	-
		108	# Final twiddling of compiler options to work around known bugs
		109
		110	nativeccprofopts="$nativecccompopts"