[Pkg-cyrus-sasl2-commits] r135 - in /cyrus-sasl-2.1/trunk/debian: changelog patches/0014_avoid_pic_overwrite.dpatch patches/00list

[fabbe at users.alioth.debian.org]

Author: fabbe
Date: Thu Nov  9 11:48:19 2006
New Revision: 135

URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/?sc=1&rev=135
Log:
Avoid overwriting PIC version of libsasldb.a with non-PIC version.

Added:
    cyrus-sasl-2.1/trunk/debian/patches/0014_avoid_pic_overwrite.dpatch   (with props)
Modified:
    cyrus-sasl-2.1/trunk/debian/changelog
    cyrus-sasl-2.1/trunk/debian/patches/00list

Modified: cyrus-sasl-2.1/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/changelog?rev=135&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/changelog (original)
+++ cyrus-sasl-2.1/trunk/debian/changelog Thu Nov  9 11:48:19 2006
@@ -16,8 +16,12 @@
     integer. Dann Frazier reported and supplied the patch. (Closes: #397549)
   * debian/patches/0013_fix_hurd_build.dpatch: This patch had gotten lost,
     it fixes building on hurd-i386. (Closes: #397714)
-
- -- Fabian Fagerholm <fabbe at debian.org>  Thu,  9 Nov 2006 08:41:01 +0200
+  * debian/patches/0014_avoid_pic_overwrite: Don't overwrite PIC version of
+    libsasldb.a with non-PIC version. This causes linking to fail when
+    making shared objects on certain platforms such as amd64 and hppa.
+    (Closes: #397603, #397605)
+
+ -- Fabian Fagerholm <fabbe at debian.org>  Thu,  9 Nov 2006 12:42:04 +0200
 
 cyrus-sasl2 (2.1.22-1) unstable; urgency=low
 

Added: cyrus-sasl-2.1/trunk/debian/patches/0014_avoid_pic_overwrite.dpatch
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/patches/0014_avoid_pic_overwrite.dpatch?rev=135&op=file
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/patches/0014_avoid_pic_overwrite.dpatch (added)
+++ cyrus-sasl-2.1/trunk/debian/patches/0014_avoid_pic_overwrite.dpatch Thu Nov  9 11:48:19 2006
@@ -1,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0014_avoid_pic_overwrite.dpatch by  <fabbe at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: This patch makes sure the non-PIC version of libsasldb.a, which is
+## DP: created out of non-PIC objects, is not going to overwrite the PIC
+## DP: version, which is created out of PIC objects. The PIC version is
+## DP: placed in .libs, and the non-PIC version in the current directory.
+## DP: This ensures that both non-PIC and PIC versions are available in
+## DP: the correct locations.
+
+ at DPATCH@
+diff -urNad trunk~/sasldb/Makefile.am trunk/sasldb/Makefile.am
+--- trunk~/sasldb/Makefile.am	2006-05-29 22:52:46.000000000 +0300
++++ trunk/sasldb/Makefile.am	2006-11-09 12:36:36.000000000 +0200
+@@ -63,6 +63,6 @@
+ EXTRA_libsasldb_a_SOURCES =
+ 
+ libsasldb.a: libsasldb.la $(SASL_DB_BACKEND_STATIC)
+-	$(AR) cru .libs/$@ $(SASL_DB_BACKEND_STATIC)
++	$(AR) cru $@ $(SASL_DB_BACKEND_STATIC)
+ 
+ 

Propchange: cyrus-sasl-2.1/trunk/debian/patches/0014_avoid_pic_overwrite.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: cyrus-sasl-2.1/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/patches/00list?rev=135&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/patches/00list (original)
+++ cyrus-sasl-2.1/trunk/debian/patches/00list Thu Nov  9 11:48:19 2006
@@ -11,3 +11,4 @@
 0011_saslauthd_ac_prog_libtool
 0012_xopen_crypt_prototype
 0013_fix_hurd_build
+0014_avoid_pic_overwrite