Don't force -fno-defer-pop.

2 files changed, 66 insertions, 3 deletions

diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo
index b83ecd597ef..548ad8a7b04 100644
--- a/lang/ocaml/distinfo
+++ b/lang/ocaml/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.70 2013/03/14 14:29:49 is Exp $
+$NetBSD: distinfo,v 1.71 2013/10/27 20:33:59 joerg Exp $
 
 SHA1 (ocaml-4.00.1.tar.bz2) = 10b8a4d0b88d20b003e3dd719f2ac9434e6a1042
 RMD160 (ocaml-4.00.1.tar.bz2) = db28f57b463af90650b877af0baf44eb226b0a79
@@ -10,7 +10,7 @@ SHA1 (patch-asmrun_power-bsd.S) = bd52898dde14adc1dbf9cd85a7f8af4d77218e6f
 SHA1 (patch-asmrun_signals_osdep.h) = cc7131ef020563ae28c1fddbe8fe634174f73826
 SHA1 (patch-byterun_Makefile) = 9681ce78c78879d29d9c58f35278a14e6cb18e96
 SHA1 (patch-camlp4_man_Makefile) = c3a5dc09a2cc15d969c4e074be7da98a979f7db4
-SHA1 (patch-configure) = 042784bf8d3561aafe62259ea9a0ed5f392b5c95
+SHA1 (patch-configure) = 6237c9ab3786182f79ca13553049c30bf6cdf549
 SHA1 (patch-debugger_Makefile.shared) = 583fa88caf965164aa3b638dda4c2a6e8878bdf9
 SHA1 (patch-man_Makefile) = 3f52dd1fcbde53399852a6490d5f27fc7c1c98e5
 SHA1 (patch-ocamldoc_Makefile) = d09c5f779dc1da9317d1c6e5eb4b251a9af45562
diff --git a/lang/ocaml/patches/patch-configure b/lang/ocaml/patches/patch-configure
index 3525e4233e6..fe313970a33 100644
--- a/lang/ocaml/patches/patch-configure
+++ b/lang/ocaml/patches/patch-configure
@@ -1,9 +1,72 @@
-$NetBSD: patch-configure,v 1.4 2013/01/25 14:49:38 jperkin Exp $
+$NetBSD: patch-configure,v 1.5 2013/10/27 20:34:00 joerg Exp $
 
 Several configure changes to work on and detect NetBSD (and some other OSes)
 
 --- configure.orig	2012-06-26 15:33:50.000000000 +0000
 +++ configure
+@@ -267,14 +267,14 @@ iflexdir=""
+ case "$bytecc,$host" in
+   cc,*-*-nextstep*)
+     # GNU C extensions disabled, but __GNUC__ still defined!
+-    bytecccompopts="-fno-defer-pop $gcc_warnings -U__GNUC__ -posix"
++    bytecccompopts="$gcc_warnings -U__GNUC__ -posix"
+     bytecclinkopts="-posix";;
+   *,*-*-rhapsody*)
+     # Almost the same as NeXTStep
+-    bytecccompopts="-fno-defer-pop $gcc_warnings -DSHRINKED_GNUC"
++    bytecccompopts="$gcc_warnings -DSHRINKED_GNUC"
+     mathlib="";;
+   *,*-*-darwin*)
+-    bytecccompopts="-fno-defer-pop $gcc_warnings"
++    bytecccompopts="$gcc_warnings"
+     mathlib=""
+     # Tell gcc that we can use 32-bit code addresses for threaded code
+     # unless we are compiled for a shared library (-fPIC option)
+@@ -282,11 +282,11 @@ case "$bytecc,$host" in
+     echo "#  define ARCH_CODE32" >> m.h
+     echo "#endif" >> m.h;;
+   *,*-*-beos*)
+-    bytecccompopts="-fno-defer-pop $gcc_warnings"
++    bytecccompopts="$gcc_warnings"
+     # No -lm library
+     mathlib="";;
+   gcc,alpha*-*-osf*)
+-    bytecccompopts="-fno-defer-pop $gcc_warnings"
++    bytecccompopts="$gcc_warnings"
+     if cc="$bytecc" sh ./hasgot -mieee; then
+       bytecccompopts="-mieee $bytecccompopts";
+     fi
+@@ -314,11 +314,11 @@ case "$bytecc,$host" in
+     bytecccompopts="-DUMK";;
+   gcc*,powerpc-*-aix*)
+     # Avoid name-space pollution by requiring Unix98-conformant includes
+-    bytecccompopts="-fno-defer-pop $gcc_warnings -D_XOPEN_SOURCE=500";;
++    bytecccompopts="$gcc_warnings -D_XOPEN_SOURCE=500";;
+   *,powerpc-*-aix*)
+     bytecccompopts="-D_XOPEN_SOURCE=500";;
+   gcc*,*-*-cygwin*)
+-    bytecccompopts="-fno-defer-pop $gcc_warnings -U_WIN32"
++    bytecccompopts="$gcc_warnings -U_WIN32"
+     dllccompopts="-U_WIN32 -DCAML_DLL"
+     if test $withsharedlibs = yes; then
+       flexlink="flexlink -chain cygwin -merge-manifest -stack 16777216"
+@@ -335,14 +335,14 @@ case "$bytecc,$host" in
+     exe=".exe"
+     ostype="Cygwin";;
+   gcc*,x86_64-*-linux*)
+-    bytecccompopts="-fno-defer-pop $gcc_warnings"
++    bytecccompopts="$gcc_warnings"
+     # Tell gcc that we can use 32-bit code addresses for threaded code
+     # unless we are compiled for a shared library (-fPIC option)
+     echo "#ifndef __PIC__" >> m.h
+     echo "#  define ARCH_CODE32" >> m.h
+     echo "#endif" >> m.h;;
+   gcc*)
+-    bytecccompopts="-fno-defer-pop $gcc_warnings";;
++    bytecccompopts="$gcc_warnings";;
+ esac
+ 
+ # Configure compiler to use in further tests
 @@ -537,7 +537,7 @@ if test $withsharedlibs = "yes"; then
        mksharedlib="$flexlink"
        mkmaindll="$flexlink -maindll"