summaryrefslogtreecommitdiffstats
path: root/development/ocaml/configure.patch
diff options
context:
space:
mode:
author Matteo Bernardini2020-04-11 16:09:18 +0200
committer Matteo Bernardini2020-04-11 16:09:18 +0200
commitb4f164a81cd8b24517e17b7c5adad38d09968638 (patch)
tree7a4fa1f58087a7c402ce313a1c629407b6fb22ce /development/ocaml/configure.patch
parent3fa270fe68663153ec4547b9988cc302cc8523ce (diff)
downloadslackbuilds-b4f164a81cd8b24517e17b7c5adad38d09968638.tar.gz
20200411.1 global branch merge.current-20200411.1
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'development/ocaml/configure.patch')
-rw-r--r--development/ocaml/configure.patch25
1 files changed, 12 insertions, 13 deletions
diff --git a/development/ocaml/configure.patch b/development/ocaml/configure.patch
index a57b19fb56..31309d3511 100644
--- a/development/ocaml/configure.patch
+++ b/development/ocaml/configure.patch
@@ -1,13 +1,12 @@
---- configure_old 2014-05-23 22:45:22.000000000 +0200
-+++ configure 2014-05-23 22:45:31.000000000 +0200
-@@ -1612,6 +1612,10 @@
- nativecccompopts="$nativecccompopts -fomit-frame-pointer";;
- esac
-
-+# Add additional flags from the environment
-+bytecccompopts="$bytecccompopts $CFLAGS"
-+nativecccompopts="$nativecccompopts $CFLAGS"
-+
- # Finish generated files
-
- cclibs="$cclibs $mathlib"
+diff -Naur ocaml-4.08.1.orig/configure ocaml-4.08.1/configure
+--- ocaml-4.08.1.orig/configure 2019-08-05 19:32:44.000000000 +0200
++++ ocaml-4.08.1/configure 2019-09-06 10:35:25.454923040 +0200
+@@ -12424,7 +12424,7 @@
+ -fno-builtin-memcmp";
+ internal_cflags="$gcc_warnings" ;; #(
+ gcc-*) :
+- common_cflags="-O2 -fno-strict-aliasing -fwrapv";
++ common_cflags="@CFLAGS@ -fno-strict-aliasing -fwrapv";
+ internal_cflags="$gcc_warnings" ;; #(
+ msvc-*) :
+ common_cflags="-nologo -O2 -Gy- -MD"