r12714 - in /trunk/libxml-libxml-common-perl/debian: changelog patches/ patches/no-extra-linking patches/series rules

[ntyni at users.alioth.debian.org]

Author: ntyni
Date: Mon Jan 14 12:50:50 2008
New Revision: 12714

URL: http://svn.debian.org/wsvn/?sc=1&rev=12714
Log:
  + no-extra-linking: prevent unnecessary linkage against libz and libm.

Added:
    trunk/libxml-libxml-common-perl/debian/patches/
    trunk/libxml-libxml-common-perl/debian/patches/no-extra-linking
    trunk/libxml-libxml-common-perl/debian/patches/series
Modified:
    trunk/libxml-libxml-common-perl/debian/changelog
    trunk/libxml-libxml-common-perl/debian/rules

Modified: trunk/libxml-libxml-common-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libxml-libxml-common-perl/debian/changelog?rev=12714&op=diff
==============================================================================
--- trunk/libxml-libxml-common-perl/debian/changelog (original)
+++ trunk/libxml-libxml-common-perl/debian/changelog Mon Jan 14 12:50:50 2008
@@ -22,6 +22,7 @@
   * Don't install the README in the binary package, it's not useful.
   * Add download URL to debian/copyright.
   * Manage debian/patches with quilt.
+    + no-extra-linking: prevent unnecessary linkage against libz and libm.
 
  -- Niko Tyni <ntyni at debian.org>  Mon, 14 Jan 2008 14:07:21 +0200
 

Added: trunk/libxml-libxml-common-perl/debian/patches/no-extra-linking
URL: http://svn.debian.org/wsvn/trunk/libxml-libxml-common-perl/debian/patches/no-extra-linking?rev=12714&op=file
==============================================================================
--- trunk/libxml-libxml-common-perl/debian/patches/no-extra-linking (added)
+++ trunk/libxml-libxml-common-perl/debian/patches/no-extra-linking Mon Jan 14 12:50:50 2008
@@ -1,0 +1,18 @@
+--- libxml-libxml-common-perl.orig/Makefile.PL
++++ libxml-libxml-common-perl/Makefile.PL
+@@ -67,6 +67,7 @@
+ }
+ 
+ 
++if (!$ENV{DEBIAN_DISABLE_EXTRA_LINKAGE}) { # not necessary on Debian
+ if ($config{LIBS} !~ /\-lxml2\b/) {
+     $config{LIBS} .= $is_Win32 ? ' -llibxml2' : ' -lxml2';
+ }
+@@ -78,6 +79,7 @@
+ if ($config{LIBS} !~ /\-lm\b/) {
+     $config{LIBS} .= $is_Win32 ? '' :' -lm';
+ }
++} # !$ENV{DEBIAN_DISABLE_EXTRA_LINKAGE}
+ 
+ if ( $config{DEBUG} ) {
+     warn "win32 compile\n" if $is_Win32;

Added: trunk/libxml-libxml-common-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/trunk/libxml-libxml-common-perl/debian/patches/series?rev=12714&op=file
==============================================================================
--- trunk/libxml-libxml-common-perl/debian/patches/series (added)
+++ trunk/libxml-libxml-common-perl/debian/patches/series Mon Jan 14 12:50:50 2008
@@ -1,0 +1,1 @@
+no-extra-linking

Modified: trunk/libxml-libxml-common-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libxml-libxml-common-perl/debian/rules?rev=12714&op=diff
==============================================================================
--- trunk/libxml-libxml-common-perl/debian/rules (original)
+++ trunk/libxml-libxml-common-perl/debian/rules Mon Jan 14 12:50:50 2008
@@ -23,7 +23,7 @@
 build: build-stamp
 build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
-	perl Makefile.PL INSTALLDIRS=vendor
+	DEBIAN_DISABLE_EXTRA_LINKAGE=1 perl Makefile.PL INSTALLDIRS=vendor
 	$(MAKE) OPTIMIZE="$(CFLAGS)" LD_RUN_PATH=""
 	$(MAKE) test
 	touch $@