diff options
| author | Karn Kallio <tierpluspluslists@gmail.com> | 2010-11-27 20:54:35 +0000 |
|---|---|---|
| committer | Karn Kallio <tierpluspluslists@gmail.com> | 2010-11-27 20:54:35 +0000 |
| commit | 675f6eb0c89a9d3ae68496192e55d70fc9b23a3f (patch) | |
| tree | 8834adecb10c9bb38fb1108f4904b8d446fd5034 /pkgs/development/perl-modules/gd-options-passthrough-and-fontconfig.patch | |
| parent | 94585b97760988f66c236e38cd7d8ef23237e90c (diff) | |
| download | nixlib-675f6eb0c89a9d3ae68496192e55d70fc9b23a3f.tar nixlib-675f6eb0c89a9d3ae68496192e55d70fc9b23a3f.tar.gz nixlib-675f6eb0c89a9d3ae68496192e55d70fc9b23a3f.tar.bz2 nixlib-675f6eb0c89a9d3ae68496192e55d70fc9b23a3f.tar.lz nixlib-675f6eb0c89a9d3ae68496192e55d70fc9b23a3f.tar.xz nixlib-675f6eb0c89a9d3ae68496192e55d70fc9b23a3f.tar.zst nixlib-675f6eb0c89a9d3ae68496192e55d70fc9b23a3f.zip | |
Add Nix expression for Perl module SQL::Translator ( also known
as SQL Fairy) and dependencies. svn path=/nixpkgs/trunk/; revision=24895
Diffstat (limited to 'pkgs/development/perl-modules/gd-options-passthrough-and-fontconfig.patch')
| -rw-r--r-- | pkgs/development/perl-modules/gd-options-passthrough-and-fontconfig.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/pkgs/development/perl-modules/gd-options-passthrough-and-fontconfig.patch b/pkgs/development/perl-modules/gd-options-passthrough-and-fontconfig.patch new file mode 100644 index 000000000000..24eab55f6eb5 --- /dev/null +++ b/pkgs/development/perl-modules/gd-options-passthrough-and-fontconfig.patch @@ -0,0 +1,49 @@ +This patch configures Getopt::Long to pass options +so they will be available at the second GetOptions call. + +Also an option to specify the search path for libfontconfig +is added. +diff -Naur GD-2.45/Makefile.PL GD-2.45-patched/Makefile.PL +--- GD-2.45/Makefile.PL 2009-07-10 13:40:07.000000000 -0430 ++++ GD-2.45-patched/Makefile.PL 2010-11-26 22:48:52.372992578 -0430 +@@ -16,9 +16,9 @@ + my (@INC,@LIBPATH,@LIBS); + my $AUTOCONFIG = 0; # global set by try_to_autoconfigure() below + +-my ($options,$lib_gd_path,$lib_ft_path,$lib_png_path,$lib_jpeg_path,$lib_xpm_path,$lib_zlib_path,$force); ++my ($options,$lib_gd_path,$lib_ft_path,$lib_png_path,$lib_jpeg_path,$lib_xpm_path,$lib_zlib_path,$lib_fontconfig_path,$force); + +-use Getopt::Long; ++use Getopt::Long qw(:config pass_through); + GetOptions("ignore_missing_gd" => \$force); + + unless (try_to_autoconfigure(\$options,\$lib_gd_path,\@INC,\@LIBPATH,\@LIBS) || $force) { +@@ -49,6 +49,7 @@ + "lib_jpeg_path=s" => \$lib_jpeg_path, + "lib_xpm_path=s" => \$lib_xpm_path, + "lib_zlib_path=s" => \$lib_zlib_path, ++ "lib_fontconfig_path=s" => \$lib_fontconfig_path, + ); + unless ($result) { + print STDERR <<END; +@@ -64,6 +65,7 @@ + -lib_jpeg_path path path to libjpeg + -lib_xpm_path path path to libxpm + -lib_zlib_path path path to libpng ++ -lib_fontconfig_path path path to libfontconfig + -ignore_missing_gd Ignore missing or old libgd installations and try to compile anyway + + If no options are passed on the command line. The program will +@@ -111,6 +113,12 @@ + @INC = ("-I$lib_zlib_path/include", @INC); + @LIBPATH = ("-L$lib_zlib_path/lib", @LIBPATH); + } ++if( defined($lib_fontconfig_path) ) ++{ ++ print "Fontconfig library used from: $lib_fontconfig_path\n"; ++ @INC = ("-I$lib_fontconfig_path/include", @INC); ++ @LIBPATH = ("-L$lib_fontconfig_path/lib", @LIBPATH); ++} + ############################################################################################# + + if ($^O eq 'VMS'){ |