mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-24 06:48:18 -07:00
94fd76c736
Note that when I rebased respect-libdir.patch, I deliberately added the .pc back in the string as it doesn't configure otherwise. Signed-off-by: Sam James <sam@gentoo.org>
38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
--- a/Makefile.PL
|
|
+++ b/Makefile.PL
|
|
@@ -66,12 +66,6 @@ END
|
|
|
|
@LIBS = qw(-lgd) unless @LIBS;
|
|
|
|
-# support for AMD64 libraries
|
|
-if (-d '/usr/lib64') {
|
|
- my @libs64 = map {my $a = $_; $a=~ s/lib$/lib64/; $a} @LIBPATH;
|
|
- @LIBPATH = (@LIBPATH,@libs64);
|
|
-}
|
|
-
|
|
#############################################################################################
|
|
# Build options passed in to script to support reproducible builds via Makefiles
|
|
#############################################################################################
|
|
@@ -229,12 +223,6 @@ if( ! defined($lib_gd_path) )
|
|
$PREFIX = prompt('Where is libgd installed?',$default_lib_gd_path);
|
|
}
|
|
|
|
-unless ($AUTOCONFIG || $PREFIX eq $default_lib_gd_path) {
|
|
- $PREFIX =~ s!/lib$!!;
|
|
- unshift @INC,"-I$PREFIX/include";
|
|
- unshift @LIBPATH,"-L$PREFIX/lib";
|
|
-}
|
|
-
|
|
# FEATURE FLAGS
|
|
|
|
##################################################################################################################
|
|
@@ -564,7 +552,7 @@ sub try_to_autoconfigure {
|
|
unless ($config) {
|
|
my %config;
|
|
require ExtUtils::PkgConfig;
|
|
- %config = ExtUtils::PkgConfig->find ("$prefix/lib/pkgconfig/gdlib") if $prefix;
|
|
+ %config = ExtUtils::PkgConfig->find ("$lib_gd_path/pkgconfig/gdlib.pc") if $prefix;
|
|
%config = ExtUtils::PkgConfig->find ("gdlib") unless %config;
|
|
return unless %config;
|
|
$version = $config{modversion};
|