Attachment #188868 for bug #221901

Lines 70-75 Link Here

(-)lang/ocaml/Makefile (+3 lines)
70	.endif	70	.endif
71		71
72	.if ${ARCH} == armv6 \|\| ${ARCH} == armv7	72	.if ${ARCH} == armv6 \|\| ${ARCH} == armv7
		73	BUILD_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils
		74	RUN_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils
		75	AS= ${LOCALBASE}/bin/as
73	CONFIGURE_ARGS+= -as "${AS} ${ASFLAGS} -meabi=5"	76	CONFIGURE_ARGS+= -as "${AS} ${ASFLAGS} -meabi=5"
74	.else	77	.else
75	CONFIGURE_ARGS+= -as "${AS} ${ASFLAGS}"	78	CONFIGURE_ARGS+= -as "${AS} ${ASFLAGS}"




+    *-*-linux-gnu|*-*-linux|*-*-dragonfly*|*-*-freebsd[3-9]*|*-*-freebsd[1-9][0-9]*|*-*-openbsd*|*-*-netbsd*|*-*-gnu*|*-*-haiku*)
       sharedcccompopts="-fPIC"
-      mksharedlib="$bytecc -shared"
+      mksharedlib="$bytecc $bytecclinkopts $bytecclinkopts $bytecclinkopts $bytecclinkopts -shared"
       bytecclinkopts="$bytecclinkopts -Wl,-E"
       byteccrpath="-Wl,-rpath,"
       mksharedlibrpath="-Wl,-rpath,"

         *gcc*)
           sharedcccompopts="-fPIC"
-          mksharedlib="$bytecc -shared"
+          mksharedlib="$bytecc $bytecclinkopts $bytecclinkopts $bytecclinkopts $bytecclinkopts -shared"
           byteccrpath="-Wl,-rpath,"
           mksharedlibrpath="-Wl,-rpath,"
           shared_libraries_supported=true;;

           sharedcccompopts="-fPIC"
           if sh ./solaris-ld; then
-            mksharedlib="$bytecc -shared"
+            mksharedlib="$bytecc $bytecclinkopts $bytecclinkopts $bytecclinkopts $bytecclinkopts -shared"
             byteccrpath="-R"
             mksharedlibrpath="-R"
           else
-            mksharedlib="$bytecc -shared"
+            mksharedlib="$bytecc $bytecclinkopts $bytecclinkopts $bytecclinkopts $bytecclinkopts -shared"
             bytecclinkopts="$bytecclinkopts -Wl,-E"
             natdynlinkopts="-Wl,-E"
             byteccrpath="-Wl,-rpath,"

       shared_libraries_supported=true;;
     i[3456]86-*-darwin[89].*)
-      mksharedlib="$bytecc -bundle -flat_namespace -undefined suppress -read_only_relocs suppress"
+      mksharedlib="$bytecc $bytecclinkopts $bytecclinkopts $bytecclinkopts $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 $bytecclinkopts $bytecclinkopts $bytecclinkopts -bundle -flat_namespace -undefined suppress -Wl,-no_compact_unwind"
       bytecccompopts="$dl_defs $bytecccompopts"
       dl_needs_underscore=false
       shared_libraries_supported=true;;

     *-*-openbsd*)
       sharedcccompopts="-fPIC"
-      mksharedlib="$bytecc -shared"
+      mksharedlib="$bytecc $bytecclinkopts $bytecclinkopts $bytecclinkopts $bytecclinkopts -shared"
       bytecclinkopts="$bytecclinkopts -Wl,-E"
       natdynlinkopts="-Wl,-E"
       byteccrpath="-Wl,-rpath,"

 # FIXME the naming of nativecclinkopts is broken: these are options for
 # ld (for shared libs), not for cc
 nativeccrpath="$byteccrpath"
@@ -932,6 +937,8 @@ case "$arch,$system" in
                   esac;;
   arm,freebsd)    as="${TOOLPREF}cc -c"
                   aspp="${TOOLPREF}cc -c";;

   *,freebsd)      as="${TOOLPREF}as"
                   aspp="${TOOLPREF}cc -c";;
   amd64,*|arm,*|arm64,*|i386,*|power,bsd*|sparc,*)
@@ -955,9 +962,11 @@ case "$arch,$system" in
     case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;;
   amd64,linux) profiling='prof';;
   amd64,openbsd) profiling='prof';;

   arm,linux*) profiling='prof';;
   power,elf) profiling='prof';;
   power,bsd*) profiling='prof';;
@@ -1415,6 +1424,8 @@ if test "$pthread_wanted" = "yes"; then
   case "$target" in
     *-*-solaris*)  pthread_link="-lpthread -lposix4"
                    pthread_caml_link="-cclib -lpthread -cclib -lposix4";;

     *-*-freebsd*)  pthread_link="-pthread"
                    pthread_caml_link="-cclib -pthread";;
     *-*-openbsd*)  pthread_link="-pthread"
@@ -1431,7 +1442,7 @@ if test "$pthread_wanted" = "yes"; then
     bytecccompopts="$bytecccompopts -D_REENTRANT"
     nativecccompopts="$nativecccompopts -D_REENTRANT"
     case "$target" in

           bytecccompopts="$bytecccompopts -D_THREAD_SAFE"
           nativecccompopts="$nativecccompopts -D_THREAD_SAFE";;
       *-*-openbsd*)
@@ -1601,6 +1612,7 @@ if test "$x11_include" = "not found"; then
       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 +1656,10 @@ echo "X11_LINK=$x11_link" >> Makefile
 # Look for BFD library
 
 if sh ./hasgot -DPACKAGE=ocaml -i bfd.h && \

Return to bug 221901

Lines 17-23 Link Here

(-)lang/ocaml/files/patch-configure (-13 / +13 lines)
17	+ --linux-gnu\|--linux\|--dragonfly\|--freebsd[3-9]\|--freebsd[1-9][0-9]\|--openbsd\|--netbsd\|--gnu\|--haiku*)	17	+ --linux-gnu\|--linux\|--dragonfly\|--freebsd[3-9]\|--freebsd[1-9][0-9]\|--openbsd\|--netbsd\|--gnu\|--haiku*)
18	sharedcccompopts="-fPIC"	18	sharedcccompopts="-fPIC"
19	- mksharedlib="$bytecc -shared"	19	- mksharedlib="$bytecc -shared"
20	+ mksharedlib="$bytecc $bytecclinkopts $bytecclinkopts $bytecclinkopts -shared"	20	+ mksharedlib="$bytecc $bytecclinkopts $bytecclinkopts $bytecclinkopts $bytecclinkopts -shared"
21	bytecclinkopts="$bytecclinkopts -Wl,-E"	21	bytecclinkopts="$bytecclinkopts -Wl,-E"
22	byteccrpath="-Wl,-rpath,"	22	byteccrpath="-Wl,-rpath,"
23	mksharedlibrpath="-Wl,-rpath,"	23	mksharedlibrpath="-Wl,-rpath,"
Lines 26-32 Link Here
26	gcc)	26	gcc)
27	sharedcccompopts="-fPIC"	27	sharedcccompopts="-fPIC"
28	- mksharedlib="$bytecc -shared"	28	- mksharedlib="$bytecc -shared"
29	+ mksharedlib="$bytecc $bytecclinkopts $bytecclinkopts $bytecclinkopts -shared"	29	+ mksharedlib="$bytecc $bytecclinkopts $bytecclinkopts $bytecclinkopts $bytecclinkopts -shared"
30	byteccrpath="-Wl,-rpath,"	30	byteccrpath="-Wl,-rpath,"
31	mksharedlibrpath="-Wl,-rpath,"	31	mksharedlibrpath="-Wl,-rpath,"
32	shared_libraries_supported=true;;	32	shared_libraries_supported=true;;
Lines 35-46 Link Here
35	sharedcccompopts="-fPIC"	35	sharedcccompopts="-fPIC"
36	if sh ./solaris-ld; then	36	if sh ./solaris-ld; then
37	- mksharedlib="$bytecc -shared"	37	- mksharedlib="$bytecc -shared"
38	+ mksharedlib="$bytecc $bytecclinkopts $bytecclinkopts $bytecclinkopts -shared"	38	+ mksharedlib="$bytecc $bytecclinkopts $bytecclinkopts $bytecclinkopts $bytecclinkopts -shared"
39	byteccrpath="-R"	39	byteccrpath="-R"
40	mksharedlibrpath="-R"	40	mksharedlibrpath="-R"
41	else	41	else
42	- mksharedlib="$bytecc -shared"	42	- mksharedlib="$bytecc -shared"
43	+ mksharedlib="$bytecc $bytecclinkopts $bytecclinkopts $bytecclinkopts -shared"	43	+ mksharedlib="$bytecc $bytecclinkopts $bytecclinkopts $bytecclinkopts $bytecclinkopts -shared"
44	bytecclinkopts="$bytecclinkopts -Wl,-E"	44	bytecclinkopts="$bytecclinkopts -Wl,-E"
45	natdynlinkopts="-Wl,-E"	45	natdynlinkopts="-Wl,-E"
46	byteccrpath="-Wl,-rpath,"	46	byteccrpath="-Wl,-rpath,"
Lines 49-61 Link Here
49	shared_libraries_supported=true;;	49	shared_libraries_supported=true;;
50	i[3456]86--darwin[89].)	50	i[3456]86--darwin[89].)
51	- mksharedlib="$bytecc -bundle -flat_namespace -undefined suppress -read_only_relocs suppress"	51	- mksharedlib="$bytecc -bundle -flat_namespace -undefined suppress -read_only_relocs suppress"
52	+ mksharedlib="$bytecc $bytecclinkopts $bytecclinkopts $bytecclinkopts -bundle -flat_namespace -undefined suppress -read_only_relocs suppress"	52	+ mksharedlib="$bytecc $bytecclinkopts $bytecclinkopts $bytecclinkopts $bytecclinkopts -bundle -flat_namespace -undefined suppress -read_only_relocs suppress"
53	bytecccompopts="$dl_defs $bytecccompopts"	53	bytecccompopts="$dl_defs $bytecccompopts"
54	dl_needs_underscore=false	54	dl_needs_underscore=false
55	shared_libraries_supported=true;;	55	shared_libraries_supported=true;;
56	-apple-darwin)	56	-apple-darwin)
57	- mksharedlib="$bytecc -bundle -flat_namespace -undefined suppress -Wl,-no_compact_unwind"	57	- mksharedlib="$bytecc -bundle -flat_namespace -undefined suppress -Wl,-no_compact_unwind"
58	+ mksharedlib="$bytecc $bytecclinkopts $bytecclinkopts $bytecclinkopts -bundle -flat_namespace -undefined suppress -Wl,-no_compact_unwind"	58	+ mksharedlib="$bytecc $bytecclinkopts $bytecclinkopts $bytecclinkopts $bytecclinkopts -bundle -flat_namespace -undefined suppress -Wl,-no_compact_unwind"
59	bytecccompopts="$dl_defs $bytecccompopts"	59	bytecccompopts="$dl_defs $bytecccompopts"
60	dl_needs_underscore=false	60	dl_needs_underscore=false
61	shared_libraries_supported=true;;	61	shared_libraries_supported=true;;
Lines 64-70 Link Here
64	--openbsd*)	64	--openbsd*)
65	sharedcccompopts="-fPIC"	65	sharedcccompopts="-fPIC"
66	- mksharedlib="$bytecc -shared"	66	- mksharedlib="$bytecc -shared"
67	+ mksharedlib="$bytecc $bytecclinkopts $bytecclinkopts $bytecclinkopts -shared"	67	+ mksharedlib="$bytecc $bytecclinkopts $bytecclinkopts $bytecclinkopts $bytecclinkopts -shared"
68	bytecclinkopts="$bytecclinkopts -Wl,-E"	68	bytecclinkopts="$bytecclinkopts -Wl,-E"
69	natdynlinkopts="-Wl,-E"	69	natdynlinkopts="-Wl,-E"
70	byteccrpath="-Wl,-rpath,"	70	byteccrpath="-Wl,-rpath,"
Lines 120-126 Link Here
120	# FIXME the naming of nativecclinkopts is broken: these are options for	120	# FIXME the naming of nativecclinkopts is broken: these are options for
121	# ld (for shared libs), not for cc	121	# ld (for shared libs), not for cc
122	nativeccrpath="$byteccrpath"	122	nativeccrpath="$byteccrpath"
123	@@ -932,6 +938,8 @@ case "$arch,$system" in	123	@@ -932,6 +937,8 @@ case "$arch,$system" in
124	esac;;	124	esac;;
125	arm,freebsd) as="${TOOLPREF}cc -c"	125	arm,freebsd) as="${TOOLPREF}cc -c"
126	aspp="${TOOLPREF}cc -c";;	126	aspp="${TOOLPREF}cc -c";;
Lines 129-135 Link Here
129	*,freebsd) as="${TOOLPREF}as"	129	*,freebsd) as="${TOOLPREF}as"
130	aspp="${TOOLPREF}cc -c";;	130	aspp="${TOOLPREF}cc -c";;
131	amd64,\|arm,\|arm64,\|i386,\|power,bsd\|sparc,)	131	amd64,\|arm,\|arm64,\|i386,\|power,bsd\|sparc,)
132	@@ -955,9 +963,11 @@ case "$arch,$system" in	132	@@ -955,9 +962,11 @@ case "$arch,$system" in
133	case "$nativecc" in gcc) ;; ) cc_profile='-xpg';; esac;;	133	case "$nativecc" in gcc) ;; ) cc_profile='-xpg';; esac;;
134	amd64,linux) profiling='prof';;	134	amd64,linux) profiling='prof';;
135	amd64,openbsd) profiling='prof';;	135	amd64,openbsd) profiling='prof';;
Lines 141-147 Link Here
141	arm,linux*) profiling='prof';;	141	arm,linux*) profiling='prof';;
142	power,elf) profiling='prof';;	142	power,elf) profiling='prof';;
143	power,bsd*) profiling='prof';;	143	power,bsd*) profiling='prof';;
144	@@ -1415,6 +1425,8 @@ if test "$pthread_wanted" = "yes"; then	144	@@ -1415,6 +1424,8 @@ if test "$pthread_wanted" = "yes"; then
145	case "$target" in	145	case "$target" in
146	--solaris*) pthread_link="-lpthread -lposix4"	146	--solaris*) pthread_link="-lpthread -lposix4"
147	pthread_caml_link="-cclib -lpthread -cclib -lposix4";;	147	pthread_caml_link="-cclib -lpthread -cclib -lposix4";;
Lines 150-156 Link Here
150	--freebsd*) pthread_link="-pthread"	150	--freebsd*) pthread_link="-pthread"
151	pthread_caml_link="-cclib -pthread";;	151	pthread_caml_link="-cclib -pthread";;
152	--openbsd*) pthread_link="-pthread"	152	--openbsd*) pthread_link="-pthread"
153	@@ -1431,7 +1443,7 @@ if test "$pthread_wanted" = "yes"; then	153	@@ -1431,7 +1442,7 @@ if test "$pthread_wanted" = "yes"; then
154	bytecccompopts="$bytecccompopts -D_REENTRANT"	154	bytecccompopts="$bytecccompopts -D_REENTRANT"
155	nativecccompopts="$nativecccompopts -D_REENTRANT"	155	nativecccompopts="$nativecccompopts -D_REENTRANT"
156	case "$target" in	156	case "$target" in
Lines 159-165 Link Here
159	bytecccompopts="$bytecccompopts -D_THREAD_SAFE"	159	bytecccompopts="$bytecccompopts -D_THREAD_SAFE"
160	nativecccompopts="$nativecccompopts -D_THREAD_SAFE";;	160	nativecccompopts="$nativecccompopts -D_THREAD_SAFE";;
161	--openbsd*)	161	--openbsd*)
162	@@ -1601,6 +1613,7 @@ if test "$x11_include" = "not found"; then	162	@@ -1601,6 +1612,7 @@ if test "$x11_include" = "not found"; then
163	else	163	else
164	x11_libs="-L$dir"	164	x11_libs="-L$dir"
165	case "$target" in	165	case "$target" in
Lines 167-173 Link Here
167	-kfreebsd-gnu) x11_link="-L$dir -lX11";;	167	-kfreebsd-gnu) x11_link="-L$dir -lX11";;
168	--bsd) x11_link="-R$dir -L$dir -lX11";;	168	--bsd) x11_link="-R$dir -L$dir -lX11";;
169	*) x11_link="-L$dir -lX11";;	169	*) x11_link="-L$dir -lX11";;
170	@@ -1644,10 +1657,10 @@ echo "X11_LINK=$x11_link" >> Makefile	170	@@ -1644,10 +1656,10 @@ echo "X11_LINK=$x11_link" >> Makefile
171	# Look for BFD library	171	# Look for BFD library
172		172
173	if sh ./hasgot -DPACKAGE=ocaml -i bfd.h && \	173	if sh ./hasgot -DPACKAGE=ocaml -i bfd.h && \