[Pkg-apache-commits] r954 - in /trunk/apr: changelog patches/00list patches/026_omit_extra_libs.dpatch

[sf at alioth.debian.org]

Author: sf
Date: Sun Jun  7 19:15:10 2009
New Revision: 954

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=954
Log:
Omit spurious libs from apr-1-config --libs output

Added:
    trunk/apr/patches/026_omit_extra_libs.dpatch   (with props)
Modified:
    trunk/apr/changelog
    trunk/apr/patches/00list

Modified: trunk/apr/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr/changelog?rev=954&op=diff
==============================================================================
--- trunk/apr/changelog (original)
+++ trunk/apr/changelog Sun Jun  7 19:15:10 2009
@@ -6,6 +6,7 @@
     - disable tests on hurd for now
     - Deactivate missing multicast support on Hurd (by removing
       HAVE_STRUCT_IPMREQ manually). 
+  * Omit spurious libs from apr-1-config --libs output (closes: #463399)
 
  -- Stefan Fritsch <sf at debian.org>  Sat, 30 May 2009 17:30:06 +0200
 

Modified: trunk/apr/patches/00list
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr/patches/00list?rev=954&op=diff
==============================================================================
--- trunk/apr/patches/00list (original)
+++ trunk/apr/patches/00list Sun Jun  7 19:15:10 2009
@@ -7,3 +7,4 @@
 023_fix_doxygen.dpatch
 024_hppa_flock_EWOULDBLOCK_weirdness.dpatch
 025_GNU_SOURCE_earlier.dpatch
+026_omit_extra_libs.dpatch

Added: trunk/apr/patches/026_omit_extra_libs.dpatch
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr/patches/026_omit_extra_libs.dpatch?rev=954&op=file
==============================================================================
--- trunk/apr/patches/026_omit_extra_libs.dpatch (added)
+++ trunk/apr/patches/026_omit_extra_libs.dpatch Sun Jun  7 19:15:10 2009
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 026_omit_extra_libs.dpatch by Stefan Fritsch <sf at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: #463399
+
+ at DPATCH@
+diff -urNad trunk~/apr-config.in trunk/apr-config.in
+--- trunk~/apr-config.in	2009-06-07 21:08:49.000000000 +0200
++++ trunk/apr-config.in	2009-06-07 21:10:50.573842471 +0200
+@@ -36,7 +36,7 @@
+ CPPFLAGS="@EXTRA_CPPFLAGS@"
+ CFLAGS="@EXTRA_CFLAGS@"
+ LDFLAGS="@EXTRA_LDFLAGS@"
+-LIBS="@EXTRA_LIBS@"
++LIBS=""
+ EXTRA_INCLUDES="@EXTRA_INCLUDES@"
+ SHLIBPATH_VAR="@shlibpath_var@"
+ APR_SOURCE_DIR="@apr_srcdir@"

Propchange: trunk/apr/patches/026_omit_extra_libs.dpatch
------------------------------------------------------------------------------
    svn:executable = *