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

[Stefano Zacchiroli]

Author: zack
Date: 2005-07-31 20:03:35 +0000 (Sun, 31 Jul 2005)
New Revision: 1556

Added:
   trunk/packages/pcre-ocaml/trunk/debian/patches/31_fpic.dpatch
Modified:
   trunk/packages/pcre-ocaml/trunk/debian/changelog
   trunk/packages/pcre-ocaml/trunk/debian/patches/00list
Log:
build pcre_stubs.o with -fPIC


Modified: trunk/packages/pcre-ocaml/trunk/debian/changelog
===================================================================
--- trunk/packages/pcre-ocaml/trunk/debian/changelog	2005-07-31 19:52:48 UTC (rev 1555)
+++ trunk/packages/pcre-ocaml/trunk/debian/changelog	2005-07-31 20:03:35 UTC (rev 1556)
@@ -1,13 +1,15 @@
-pcre-ocaml (5.10.0-3) UNRELEASED; urgency=low
+pcre-ocaml (5.10.0-3) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * debian/patches/31_fpic
+    - patched OCamlMakefile so that pcre_stubs.o is built with -fPIC,
+      fixes FTBFS on amd64 and other archs (Closes: Bug#320624).
 
- -- Stefano Zacchiroli <zack at takhisis.invalid>  Fri, 29 Jul 2005 22:02:50 +0200
+ -- Stefano Zacchiroli <zack at debian.org>  Sun, 31 Jul 2005 22:01:15 +0200
 
 pcre-ocaml (5.10.0-2) unstable; urgency=low
 
   * debian/control
-    - added build-dep on dpatch (closes: Bug#320456).
+    - added build-dep on dpatch (Closes: Bug#320456).
 
  -- Stefano Zacchiroli <zack at debian.org>  Fri, 29 Jul 2005 17:36:36 +0200
 

Modified: trunk/packages/pcre-ocaml/trunk/debian/patches/00list
===================================================================
--- trunk/packages/pcre-ocaml/trunk/debian/patches/00list	2005-07-31 19:52:48 UTC (rev 1555)
+++ trunk/packages/pcre-ocaml/trunk/debian/patches/00list	2005-07-31 20:03:35 UTC (rev 1556)
@@ -1,2 +1,3 @@
 17_build
 19_meta
+31_fpic

Added: trunk/packages/pcre-ocaml/trunk/debian/patches/31_fpic.dpatch
===================================================================
--- trunk/packages/pcre-ocaml/trunk/debian/patches/31_fpic.dpatch	2005-07-31 19:52:48 UTC (rev 1555)
+++ trunk/packages/pcre-ocaml/trunk/debian/patches/31_fpic.dpatch	2005-07-31 20:03:35 UTC (rev 1556)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 31_fpic.dpatch by Stefano Zacchiroli <zack at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad --exclude=CVS --exclude=.svn ./OCamlMakefile /tmp/dpep-work.483SSF/trunk/OCamlMakefile
+--- ./OCamlMakefile	2005-06-09 01:42:12.000000000 +0200
++++ /tmp/dpep-work.483SSF/trunk/OCamlMakefile	2005-07-31 22:00:28.000000000 +0200
+@@ -1011,6 +1011,7 @@
+ 
+ .c.$(EXT_OBJ):
+ 			$(OCAMLC) -c -cc "$(CC)" -ccopt "$(CFLAGS) \
++				-fPIC \
+ 				$(CPPFLAGS) $(CPPFLAGS_WIN32) \
+ 				$(CFLAGS_WIN32) $(CINCFLAGS) $(CFLAG_O)$@ " $< 
+ 


Property changes on: trunk/packages/pcre-ocaml/trunk/debian/patches/31_fpic.dpatch
___________________________________________________________________
Name: svn:executable
   + *