From: Samuel Mimram <smimram@debian.org>
Date: Tue, 18 Apr 2006 14:39:33 +0000 (+0000)
Subject: Upload to experimental + patch to remove rpaths.
X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~649
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c66c8a09fafcf1c31ed5730164efdbbeb11571b2;p=ocaml.git

Upload to experimental + patch to remove rpaths.
---

diff --git a/debian/changelog b/debian/changelog
index f1656027..fb198451 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-ocaml (3.09.2-1) unstable; urgency=low
+ocaml (3.09.2-1) experimental; urgency=low
 
   * New upstream release.
+  * Added no_rpath.dpatch in order for caml not to put rpath in generated
+    executables, closes: #361865.
 
  -- Samuel Mimram <smimram@debian.org>  Sun, 16 Apr 2006 23:32:02 +0000
 
diff --git a/debian/patches/00list b/debian/patches/00list
index f2583a23..e8d42fb4 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -6,3 +6,4 @@ man-ocamlmklib
 alpha_ld_no-relax
 call_ld_with_proper_flags
 #pr_o
+no_rpath
diff --git a/debian/patches/no_rpath.dpatch b/debian/patches/no_rpath.dpatch
new file mode 100755
index 00000000..94725c91
--- /dev/null
+++ b/debian/patches/no_rpath.dpatch
@@ -0,0 +1,37 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## no_rpath.dpatch by Red Hat people
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Don't use rpath. This was shamelessly taken from
+## DP: http://cvs.fedora.redhat.com/lxr/extras/source/devel/ocaml/ocaml-rpath.patch
+
+@DPATCH@
+diff -urNad ocaml-3.09.2~/tools/Makefile ocaml-3.09.2/tools/Makefile
+--- ocaml-3.09.2~/tools/Makefile	2006-04-18 14:25:24.000000000 +0000
++++ ocaml-3.09.2/tools/Makefile	2006-04-18 14:32:09.000000000 +0000
+@@ -102,9 +102,6 @@
+ 	sed -e "s|%%BINDIR%%|$(BINDIR)|" \
+             -e "s|%%SUPPORTS_SHARED_LIBRARIES%%|$(SUPPORTS_SHARED_LIBRARIES)|" \
+             -e "s|%%MKSHAREDLIB%%|$(MKSHAREDLIB)|" \
+-            -e "s|%%BYTECCRPATH%%|$(BYTECCRPATH)|" \
+-            -e "s|%%NATIVECCRPATH%%|$(NATIVECCRPATH)|" \
+-            -e "s|%%MKSHAREDLIBRPATH%%|$(MKSHAREDLIBRPATH)|" \
+             -e "s|%%RANLIB%%|$(RANLIB)|" \
+           ocamlmklib.mlp >> ocamlmklib.ml
+ 
+diff -urNad ocaml-3.09.2~/tools/ocamlmklib.mlp ocaml-3.09.2/tools/ocamlmklib.mlp
+--- ocaml-3.09.2~/tools/ocamlmklib.mlp	2004-11-27 01:04:19.000000000 +0000
++++ ocaml-3.09.2/tools/ocamlmklib.mlp	2006-04-18 14:32:09.000000000 +0000
+@@ -17,9 +17,9 @@
+ let bindir = "%%BINDIR%%"
+ and supports_shared_libraries = %%SUPPORTS_SHARED_LIBRARIES%%
+ and mksharedlib = "%%MKSHAREDLIB%%"
+-and bytecc_rpath = "%%BYTECCRPATH%%"
+-and nativecc_rpath = "%%NATIVECCRPATH%%"
+-and mksharedlib_rpath = "%%MKSHAREDLIBRPATH%%"
++and bytecc_rpath = ""
++and nativecc_rpath = ""
++and mksharedlib_rpath = ""
+ and ranlib = "%%RANLIB%%"
+ 
+ let bytecode_objs = ref []  (* .cmo,.cma,.ml,.mli files to pass to ocamlc *)