[SCM] Debian packaging of Wx-Scintilla CPAN distribution branch, master, updated. debian/0.38-1-17-g1cc7cc6

gregor herrmann gregoa at debian.org
Mon Jun 17 22:03:39 UTC 2013


The following commit has been merged in the master branch:
commit 1cc7cc6ebf2e8a4372df3c9d23aaa5ba6a1a533d
Author: gregor herrmann <gregoa at debian.org>
Date:   Tue Jun 18 00:03:18 2013 +0200

    Add patch to pass hardening flags through.

diff --git a/debian/patches/hardening-flags b/debian/patches/hardening-flags
new file mode 100644
index 0000000..0f13414
--- /dev/null
+++ b/debian/patches/hardening-flags
@@ -0,0 +1,46 @@
+Description: pass through hardening flags to the build system
+Origin: vendor
+Forwarded: not-yet
+Author: gregor herrmann <gregoa at debian.org>
+Last-Update: 2013-06-18
+
+--- a/inc/Module/Build/Scintilla.pm
++++ b/inc/Module/Build/Scintilla.pm
+@@ -89,7 +89,9 @@
+ 
+ sub stc_ldflags {
+ 	my $self = shift;
+-	return Alien::wxWidgets->link_flags;
++	my $flags = Alien::wxWidgets->link_flags;
++	$flags .= ' ' . $ENV{LDFLAGS};
++	return $flags;
+ }
+ 
+ sub stc_defines {
+@@ -119,6 +121,7 @@
+ 	my $flags   = qx($command);
+ 	chomp($flags);
+ 	$flags .= ' ' . Alien::wxWidgets->c_flags;
++	$flags .= ' ' . $ENV{CFLAGS} . ' ' . $ENV{CPPFLAGS};
+ 	return $flags;
+ }
+ 
+--- a/inc/Module/Build/Scintilla/GTK.pm
++++ b/inc/Module/Build/Scintilla/GTK.pm
+@@ -129,6 +129,8 @@
+ 		Alien::wxWidgets->defines,
+ 		$Config{ccflags},
+ 		$Config{optimize},
++		$ENV{CFLAGS},
++		$ENV{CPPFLAGS},
+ 		'-DWXPL_EXT -DVERSION=\"' . $dist_version . '\" -DXS_VERSION=\"' . $dist_version . '\"',
+ 		'Scintilla.c',
+ 	);
+@@ -143,6 +145,7 @@
+ 		Alien::wxWidgets->linker,
+ 		Alien::wxWidgets->link_flags,
+ 		$Config{lddlflags},
++		$ENV{LDFLAGS},
+ 		'-fPIC -L.',
+ 		'-s -o ' . $dll,
+ 		'Scintilla.o',
diff --git a/debian/patches/series b/debian/patches/series
index 4a52ba7..0303591 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 remove-uneeded-libs
+hardening-flags

-- 
Debian packaging of Wx-Scintilla CPAN distribution



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