summaryrefslogtreecommitdiffstats
path: root/perl
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2011-07-22 11:12:52 +0100
committerRichard W.M. Jones <rjones@redhat.com>2011-07-22 11:12:52 +0100
commit8386a57458aceb768f0e59aa090a15a544f7466e (patch)
tree8b2691b239b90fa87517217875f99a5d0244fe5e /perl
parent71eb0bf45649eefa1f0cd4b1372cfc2653c8e7a5 (diff)
downloadlibguestfs-8386a57458aceb768f0e59aa090a15a544f7466e.tar.gz
libguestfs-8386a57458aceb768f0e59aa090a15a544f7466e.tar.xz
libguestfs-8386a57458aceb768f0e59aa090a15a544f7466e.zip
perl: Fix CCFLAGS for Perl 5.14.
A change to ExtUtils::CBuilder in Perl 5.14 causes CCFLAGS to completely replace, rather than appending, the C flags. The unfortunate consequence of this is that vital flags such as -D_FILE_OFFSET_BITS=64 are missing. For 32 bit code, this means you get binary-incompatible code that completely fails to load. For further analysis see: http://www.nntp.perl.org/group/perl.perl5.porters/2011/04/msg171535.html This commit changes CCFLAGS so that it appends to the existing $Config{ccflags} instead of replacing it. On earlier versions of Perl this means we get two copies of the flags, which is unfortunate but should be safe.
Diffstat (limited to 'perl')
-rw-r--r--perl/Makefile.PL.in5
1 files changed, 3 insertions, 2 deletions
diff --git a/perl/Makefile.PL.in b/perl/Makefile.PL.in
index 410e076b..62cd04b1 100644
--- a/perl/Makefile.PL.in
+++ b/perl/Makefile.PL.in
@@ -1,5 +1,5 @@
# libguestfs Perl bindings
-# Copyright (C) 2009-2010 Red Hat Inc.
+# Copyright (C) 2009-2011 Red Hat Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -15,6 +15,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+use Config;
use ExtUtils::MakeMaker;
WriteMakefile (
@@ -26,5 +27,5 @@ WriteMakefile (
LIBS => '-L@top_builddir@/src/.libs -lguestfs',
INC => '-I@top_builddir@/src -I@top_srcdir@/src',
TYPEMAPS => [ '@srcdir@/typemap' ],
- CCFLAGS => '@CFLAGS@',
+ CCFLAGS => $Config{ccflags} . ' @CFLAGS@',
);