725d4a96c7
It's been decided to allow the Fedora 27 Mass Rebuild to take place
before OCaml 4.05.0 is added to Fedora. To avoid this package
accidentally getting included in the mass rebuild, this commit reverts
the new upstream version, and then it will be un-re-verted after the
Mass Rebuild.
This reverts commit 40c060b8ec.
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
From ff87e5c4252e5545e50fff0a2e7c10b813c02ec2 Mon Sep 17 00:00:00 2001
|
|
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
Date: Tue, 24 Jun 2014 10:00:15 +0100
|
|
Subject: [PATCH 1/9] Don't add rpaths to libraries.
|
|
|
|
---
|
|
tools/Makefile.shared | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/tools/Makefile.shared b/tools/Makefile.shared
|
|
index a873bdd98..ba263b88f 100644
|
|
--- a/tools/Makefile.shared
|
|
+++ b/tools/Makefile.shared
|
|
@@ -154,9 +154,9 @@ $(call byte_and_opt,ocamlmklib,ocamlmklibconfig.cmo config.cmo misc.cmo \
|
|
ocamlmklibconfig.ml: ../config/Makefile Makefile
|
|
(echo 'let bindir = "$(BINDIR)"'; \
|
|
echo 'let supports_shared_libraries = $(SUPPORTS_SHARED_LIBRARIES)';\
|
|
- echo 'let byteccrpath = "$(BYTECCRPATH)"'; \
|
|
- echo 'let nativeccrpath = "$(NATIVECCRPATH)"'; \
|
|
- echo 'let mksharedlibrpath = "$(MKSHAREDLIBRPATH)"'; \
|
|
+ echo 'let byteccrpath = ""'; \
|
|
+ echo 'let nativeccrpath = ""'; \
|
|
+ echo 'let mksharedlibrpath = ""'; \
|
|
echo 'let toolpref = "$(TOOLPREF)"'; \
|
|
sed -n -e 's/^#ml //p' ../config/Makefile) \
|
|
> ocamlmklibconfig.ml
|
|
--
|
|
2.13.1
|
|
|