X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=cirros-testvm%2Fsrc-cirros%2Fbuildroot-2015.05%2Fpackage%2Fperl-gd%2F0003-force.patch;fp=cirros-testvm%2Fsrc-cirros%2Fbuildroot-2015.05%2Fpackage%2Fperl-gd%2F0003-force.patch;h=0a121a994e625ca4574df886bf18302398110b11;hb=b0a0f15dfaa205161a7fcb20cf1b8cd4948c2ef3;hp=0000000000000000000000000000000000000000;hpb=c6ac3cd55ee2da956195eee393b0882105dfad4e;p=packages%2Ftrusty%2Fcirros-testvm.git diff --git a/cirros-testvm/src-cirros/buildroot-2015.05/package/perl-gd/0003-force.patch b/cirros-testvm/src-cirros/buildroot-2015.05/package/perl-gd/0003-force.patch new file mode 100644 index 0000000..0a121a9 --- /dev/null +++ b/cirros-testvm/src-cirros/buildroot-2015.05/package/perl-gd/0003-force.patch @@ -0,0 +1,32 @@ +let @INC and @LIBPATH empty when ignore_missing_gd + +Signed-off-by: Francois Perrad +see https://github.com/lstein/Perl-GD/pull/7 + +Index: b/Makefile.PL +=================================================================== +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -35,13 +35,15 @@ + } + + push @LIBS, "-lgd"; +-@INC = qw(-I/usr/include -I/usr/include/gd) unless @INC; +-@LIBPATH = qw(-L/usr/lib/X11 -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/lib) unless @LIBPATH; +- +-# support for AMD64 libraries +-if (-d '/usr/lib64') { +- my @libs64 = map {my $a = $_; $a=~ s/lib$/lib64/; $a} @LIBPATH; +- @LIBPATH = (@LIBPATH,@libs64); ++unless ($force) { ++ @INC = qw(-I/usr/include -I/usr/include/gd) unless @INC; ++ @LIBPATH = qw(-L/usr/lib/X11 -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/lib) unless @LIBPATH; ++ ++ # support for AMD64 libraries ++ if (-d '/usr/lib64') { ++ my @libs64 = map {my $a = $_; $a=~ s/lib$/lib64/; $a} @LIBPATH; ++ @LIBPATH = (@LIBPATH,@libs64); ++ } + } + + #############################################################################################