7335bbf1f3
- REMOVED labltk and camlp4 packages, since these are now packaged separately upstream. - Upstream includes fix for stack alignment issues on i686, so remove hack. - Upstream now uses mkstemp where available, so patch removed. - Upstream includes Aarch64 backend, so remove our own backport. - Drop BR on ocaml-srpm-macros, since it is now included in Fedora.
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
From 8d1cb3e2a169a642a0c75e965bc6fc17184124c8 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 03/10] 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 c4c9030..7a918e5 100644
|
|
--- a/tools/Makefile.shared
|
|
+++ b/tools/Makefile.shared
|
|
@@ -112,9 +112,9 @@ ocamlmklibconfig.ml: ../config/Makefile
|
|
echo 'let ext_dll = "$(EXT_DLL)"'; \
|
|
echo 'let supports_shared_libraries = $(SUPPORTS_SHARED_LIBRARIES)';\
|
|
echo 'let mkdll = "$(MKDLL)"'; \
|
|
- 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
|
|
--
|
|
1.9.0
|
|
|