tags 660041 + patch
tags 660041 + pending
thanks
Dear maintainer,
I've prepared an NMU for flow-tools (versioned as 1:0.68-12.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
Regards.
diff -u flow-tools-0.68/debian/rules flow-tools-0.68/debian/rules
--- flow-tools-0.68/debian/rules
+++ flow-tools-0.68/debian/rules
@@ -39,6 +39,7 @@
$(CF)/Cflow.xs: contrib/Cflow-1.051.tar.gz
cd contrib/ && tar xzmf Cflow-1.051.tar.gz
cd $(CF) && patch -p1 < ../Cflow-debian.diff
+ cd $(CF) && patch -p1 < ../Cflow-ccflags.diff
configure: config-stamp
configure-stamp: $(CF)/Cflow.xs
diff -u flow-tools-0.68/debian/changelog flow-tools-0.68/debian/changelog
--- flow-tools-0.68/debian/changelog
+++ flow-tools-0.68/debian/changelog
@@ -1,3 +1,11 @@
+flow-tools (1:0.68-12.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Added patch to fix error loading module with perl 5.14
+ (closes: 660041, LP: #936170).
+
+ -- Leo Iannacone <[email protected]> Tue, 21 Feb 2012 00:35:51 +0100
+
flow-tools (1:0.68-12) unstable; urgency=low
* Added a patch so that flow-send compiled with gcc4 won't fail
only in patch2:
unchanged:
--- flow-tools-0.68.orig/contrib/Cflow-ccflags.diff
+++ flow-tools-0.68/contrib/Cflow-ccflags.diff
@@ -0,0 +1,36 @@
+Description: Adds $Config{ccflags} to the build environment.
+ This fixes "Compilation failed in require." error at runtime
+ while try to load module using perl 5.14.
+Author: Dominic Hargreaves <[email protected]>
+Bug-Debian: http://bugs.debian.org/660041
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/936170
+
+--- Cflow-1.051/Makefile.PL.orig 2002-01-11 22:23:52.000000000 +0000
++++ Cflow-1.051/Makefile.PL 2012-02-15 22:26:33.000000000 +0000
+@@ -3,7 +3,7 @@
+
+ require 5.003; # for INSTALLSCRIPT
+
+-# use Config;
++use Config;
+ use ExtUtils::MakeMaker;
+ # See lib/ExtUtils/MakeMaker.pm for details of how to influence
+ # the contents of the Makefile that is written.
+@@ -49,7 +49,7 @@
+ }
+ if ("$libdir") {
+ print "Found flow-tools... using \"-DOSU $incdir $libdir -lft -lz\".\n";
+- return { CCFLAGS => '-DOSU',
++ return { CCFLAGS => "-DOSU $Config{ccflags}",
+ INC => join(' ', $incdir),
+ LIBS => [ join(' ', $libdir, '-lnsl -lft -lz') ] }
+ }
+@@ -66,7 +66,7 @@
+ }
+ if ("$libdir") {
+ print "Found argus... using \"-DARGUS $incdir $dir/argus_common.a
$dir/argus_parse.a\".\n";
+- return { CCFLAGS => '-DARGUS',
++ return { CCFLAGS => "-DARGUS $Config{ccflags}",
+ INC => join(' ', $incdir),
+ LIBS => [ join(' ', $libdir, '-lnsl', '-lm') ],
+ LDFROM => "\$(OBJECT) $dir/argus_common.a $dir/argus_parse.a" }
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
