patch to avoid issue with EU::MM and CCFLAGS

epel9
Iain Arnell 14 years ago
parent f1f7ccf007
commit 21cb7a6f8d

@ -0,0 +1,12 @@
diff -up GD-2.44/Makefile.PL.orig GD-2.44/Makefile.PL
--- GD-2.44/Makefile.PL.orig 2011-06-18 02:28:12.000000000 +0200
+++ GD-2.44/Makefile.PL 2011-06-18 02:28:50.000000000 +0200
@@ -246,7 +246,7 @@ WriteMakefile(
'PL_FILES' => {'bdf_scripts/bdf2gdfont.PLS' => 'bdf_scripts/bdf2gdfont.pl',
'GD/Image.pm.PLS' => 'GD/Image.pm',
},
- 'CCFLAGS' => '-Wformat=0',
+ 'CCFLAGS' => "-Wformat=0 $Config{ccflags}",
'EXE_FILES' => ['bdf_scripts/bdf2gdfont.pl'],
'AUTHOR' => 'Lincoln Stein (lstein@cshl.org)',
'ABSTRACT' => 'Interface to Gd Graphics Library',

@ -1,6 +1,6 @@
Name: perl-GD Name: perl-GD
Version: 2.44 Version: 2.44
Release: 7%{?dist} Release: 8%{?dist}
Summary: Perl interface to the GD graphics library Summary: Perl interface to the GD graphics library
Group: Development/Libraries Group: Development/Libraries
@ -9,6 +9,9 @@ URL: http://search.cpan.org/dist/GD/
Source0: http://www.cpan.org/authors/id/L/LD/LDS/GD-%{version}.tar.gz Source0: http://www.cpan.org/authors/id/L/LD/LDS/GD-%{version}.tar.gz
Patch0: perl-GD-2.41-Group.patch Patch0: perl-GD-2.41-Group.patch
Patch1: perl-GD-skip-3.patch Patch1: perl-GD-skip-3.patch
# see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=628522
# and https://rt.cpan.org/Public/Bug/Display.html?id=67990
Patch2: perl-GD-ccflags.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gd-devel >= 2.0.28 BuildRequires: gd-devel >= 2.0.28
@ -28,6 +31,7 @@ create PNG images on the fly or modify existing files.
%ifarch %{ix86} %ifarch %{ix86}
%patch1 -p1 %patch1 -p1
%endif %endif
%patch2 -p1
%{__perl} -pi -e 's|/usr/local/bin/perl\b|%{__perl}|' \ %{__perl} -pi -e 's|/usr/local/bin/perl\b|%{__perl}|' \
qd.pl demos/{*.{pl,cgi},truetype_test} qd.pl demos/{*.{pl,cgi},truetype_test}
chmod -c 644 bdf_scripts/* demos/* chmod -c 644 bdf_scripts/* demos/*
@ -35,7 +39,7 @@ chmod -c 755 qd.pl
%build %build
CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS" make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
@ -77,6 +81,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Sat Jun 18 2011 Iain Arnell <iarnell@gmail.com> 2.44-8
- patch to avoid issue with ExtUtils::MakeMaker and CCFLAGS
see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=628522
* Wed Jun 15 2011 Marcela Mašláňová <mmaslano@redhat.com> - 2.44-7 * Wed Jun 15 2011 Marcela Mašláňová <mmaslano@redhat.com> - 2.44-7
- Perl mass rebuild - Perl mass rebuild

Loading…
Cancel
Save