From f21f1d8491fbf77744b6f6c97e0360c42b685baf Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 20 Jun 2011 13:08:51 +0100 Subject: [PATCH] - Temporarily stop setting CCFLAGS in perl subdirectory. See: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=628522 --- 0001-perl-Don-t-set-CCFLAGS.patch | 23 +++++++++++++++++++++++ libguestfs.spec | 11 ++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 0001-perl-Don-t-set-CCFLAGS.patch diff --git a/0001-perl-Don-t-set-CCFLAGS.patch b/0001-perl-Don-t-set-CCFLAGS.patch new file mode 100644 index 0000000..daf4668 --- /dev/null +++ b/0001-perl-Don-t-set-CCFLAGS.patch @@ -0,0 +1,23 @@ +From a1ca9ce8ff486dba84608c5904356336b555666c Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Mon, 20 Jun 2011 13:06:20 +0100 +Subject: [PATCH] perl: Don't set CCFLAGS. + +See: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=628522 +--- + perl/Makefile.PL.in | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +diff --git a/perl/Makefile.PL.in b/perl/Makefile.PL.in +index 410e076..31147aa 100644 +--- a/perl/Makefile.PL.in ++++ b/perl/Makefile.PL.in +@@ -26,5 +26,4 @@ WriteMakefile ( + LIBS => '-L@top_builddir@/src/.libs -lguestfs', + INC => '-I@top_builddir@/src -I@top_srcdir@/src', + TYPEMAPS => [ '@srcdir@/typemap' ], +- CCFLAGS => '@CFLAGS@', + ); +-- +1.7.5.2 + diff --git a/libguestfs.spec b/libguestfs.spec index 1a18ec8..7708247 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -30,7 +30,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.11.10 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://libguestfs.org/ @@ -40,6 +40,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root # Disable FUSE tests, not supported in Koji at the moment. Patch0: libguestfs-1.7.13-no-fuse-test.patch +# Temporarily stop setting CCFLAGS in perl subdirectory. +# See: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=628522 +Patch1: 0001-perl-Don-t-set-CCFLAGS.patch + # Basic build requirements: BuildRequires: /usr/bin/pod2man BuildRequires: /usr/bin/pod2text @@ -437,6 +441,7 @@ php-%{name} contains PHP bindings for %{name}. %setup -q %patch0 -p1 +%patch1 -p1 mkdir -p daemon/m4 @@ -777,6 +782,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jun 20 2011 Richard W.M. Jones - 1:1.11.10-3 +- Temporarily stop setting CCFLAGS in perl subdirectory. + See: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=628522 + * Fri Jun 17 2011 Marcela Mašláňová - 1:1.11.10-2 - Perl mass rebuild