[Pkg-ocaml-maint-commits] r2626 - in trunk/packages/ocaml/trunk/debian: . patches

[Samuel Mimram]

Author: smimram
Date: 2006-04-18 14:39:33 +0000 (Tue, 18 Apr 2006)
New Revision: 2626

Added:
   trunk/packages/ocaml/trunk/debian/patches/no_rpath.dpatch
Modified:
   trunk/packages/ocaml/trunk/debian/changelog
   trunk/packages/ocaml/trunk/debian/patches/00list
Log:
Upload to experimental + patch to remove rpaths.

Modified: trunk/packages/ocaml/trunk/debian/changelog
===================================================================
--- trunk/packages/ocaml/trunk/debian/changelog	2006-04-18 13:42:16 UTC (rev 2625)
+++ trunk/packages/ocaml/trunk/debian/changelog	2006-04-18 14:39:33 UTC (rev 2626)
@@ -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 at debian.org>  Sun, 16 Apr 2006 23:32:02 +0000
 

Modified: trunk/packages/ocaml/trunk/debian/patches/00list
===================================================================
--- trunk/packages/ocaml/trunk/debian/patches/00list	2006-04-18 13:42:16 UTC (rev 2625)
+++ trunk/packages/ocaml/trunk/debian/patches/00list	2006-04-18 14:39:33 UTC (rev 2626)
@@ -6,3 +6,4 @@
 alpha_ld_no-relax
 call_ld_with_proper_flags
 #pr_o
+no_rpath

Added: trunk/packages/ocaml/trunk/debian/patches/no_rpath.dpatch
===================================================================
--- trunk/packages/ocaml/trunk/debian/patches/no_rpath.dpatch	2006-04-18 13:42:16 UTC (rev 2625)
+++ trunk/packages/ocaml/trunk/debian/patches/no_rpath.dpatch	2006-04-18 14:39:33 UTC (rev 2626)
@@ -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
+
+ at 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 *)


Property changes on: trunk/packages/ocaml/trunk/debian/patches/no_rpath.dpatch
___________________________________________________________________
Name: svn:executable
   + *