Commits

Peter Szilagyi committed 2647f91

updated patch to the latest ocaml-core-external

  • Participants
  • Parent commits a06bab7

Comments (0)

Files changed (1)

File ocaml-core-external.patch

 make it work inside Jane Street when compiling on an CentOS 6 box.
 Ultimately, soon, we'll want to make these changes conditional.
 
-diff -r 9de864d21253 OMakeroot
---- a/OMakeroot	Thu Oct 18 11:59:52 2012 +0100
-+++ b/OMakeroot	Fri Nov 02 16:25:50 2012 -0400
-@@ -19,20 +19,20 @@
+diff --git a/OMakeroot b/OMakeroot
+--- a/OMakeroot
++++ b/OMakeroot
+@@ -19,6 +19,21 @@
      eprintln($"   $(string)")
    exit(1)
-
--# REDHAT_RELEASE = $(string $(shell cat /etc/redhat-release))
+ 
 +REDHAT_RELEASE = $(string $(shell cat /etc/redhat-release))
-
--# GetRedhatVersion() =
--#     match $(REDHAT_RELEASE)
--#     case $"^CentOS release 5"
--#       return 5
--#     case $"^CentOS release 6"
--#       return 6
--#     default
--#       OMakerootError($"Unknown CentOS release.  Giving up.")
++
 +GetRedhatVersion() =
 +    match $(REDHAT_RELEASE)
 +    case $"^CentOS release 5"
 +      return 6
 +    default
 +      OMakerootError($"Unknown CentOS release.  Giving up.")
-
--# REDHAT_VERSION = $(GetRedhatVersion)
++
 +REDHAT_VERSION = $(GetRedhatVersion)
-
--# println($"Running CentOS Release "$(REDHAT_VERSION))
++
 +println($"Running CentOS Release "$(REDHAT_VERSION))
-
++
  # Execute the command and show what's being executed. This way comand shows up even if omake is told to suppress most of the output
  ShowCommand(command) =
-@@ -728,8 +728,8 @@
+     if $(VERBOSE)
+@@ -715,8 +730,8 @@
            myflags += -Xlinker -rpath -Xlinker $(d)
      return $(myflags)
-
+ 
 -COMPAT_LIB_FLAGS = # $(match $(REDHAT_VERSION), 6, $(MakeCompatRootFlags false))
 -OCAML_LIB_FLAGS = # $(match $(REDHAT_VERSION), 6, $(MakeCompatRootFlags true))
 +COMPAT_LIB_FLAGS = $(match $(REDHAT_VERSION), 6, $(MakeCompatRootFlags false))
 +OCAML_LIB_FLAGS = $(match $(REDHAT_VERSION), 6, $(MakeCompatRootFlags true))
-
+ 
  RootArchiveAfterPackNative(libname) =
      Trace($"ArchiveAfterPackNative(OCAML_LIB_FLAGS=[$(OCAML_LIB_FLAGS)],$(libname))")
-@@ -775,7 +775,7 @@
+@@ -762,7 +777,7 @@
      libc.so.6
      libnsl.so.1
      linux-vdso.so.1
 -#    $(match $(REDHAT_VERSION), 6, libtinfo.so.5)
 +    $(match $(REDHAT_VERSION), 6, libtinfo.so.5)
-
+ 
  hg_version_arg = $(if $(VERSION_UTIL_SUPPORT), $(EMPTY), --no-version-util)
-
+