[SCM] Packaging of Perlbal::XS::HTTPHeaders in Debian branch, master, updated. 1d3729148d2e94764e22766c7f56665c084ee9e1

Jonathan Steinert hachi at saymedia.com
Thu Mar 22 21:32:03 UTC 2012


The following commit has been merged in the master branch:
commit 1d3729148d2e94764e22766c7f56665c084ee9e1
Author: Jonathan Steinert <hachi at saymedia.com>
Date:   Thu Mar 22 10:56:59 2012 -0700

    Skip the g++ linker, it doesn't work with DH9

diff --git a/debian/patches/clean_remove_const_files b/debian/patches/clean_remove_const_files
index ca17b4f..93340e4 100644
--- a/debian/patches/clean_remove_const_files
+++ b/debian/patches/clean_remove_const_files
@@ -1,9 +1,9 @@
 --- a/Makefile.PL
 +++ b/Makefile.PL
 @@ -20,6 +20,7 @@
+     XSOPT             => '-C++',
      CCFLAGS           => '-g',
      CC                => 'g++',
-     LD                => 'g++',
 +    clean             => { FILES => "const-c.inc const-xs.inc" },
  );
  if  (eval {require ExtUtils::Constant; 1}) {
diff --git a/debian/patches/g++_for_linking b/debian/patches/g++_for_linking
deleted file mode 100644
index 52b7d15..0000000
--- a/debian/patches/g++_for_linking
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -12,7 +12,6 @@
-     ($] >= 5.005 ?     ## Add these new keywords supported since 5.005
-       (ABSTRACT_FROM  => 'lib/Perlbal/XS/HTTPHeaders.pm', # retrieve abstract from module
-        AUTHOR         => 'Mark Smith <junior at danga.com>') : ()),
--    LIBS              => ['-lstdc++'], # e.g., '-lm'
-     DEFINE            => '', # e.g., '-DHAVE_SOMETHING'
-     INC               => '-I.', # e.g., '-I. -I/usr/include/other'
- 	# Un-comment this if you add C files to link with later:
-@@ -20,6 +19,7 @@
-     XSOPT             => '-C++',
-     CCFLAGS           => '-g',
-     CC                => 'g++',
-+    LD                => 'g++',
- );
- if  (eval {require ExtUtils::Constant; 1}) {
-   # If you edit these definitions to change the constants used by this module,
diff --git a/debian/patches/series b/debian/patches/series
index 72f6410..634bac8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-g++_for_linking
 clean_remove_const_files

-- 
Packaging of Perlbal::XS::HTTPHeaders in Debian



More information about the Pkg-perl-cvs-commits mailing list