Move all to deprecated folder.
This commit is contained in:
@@ -0,0 +1,43 @@
|
||||
fix option handling in Makefile.PL
|
||||
|
||||
the call to GetOptions() must be unique.
|
||||
|
||||
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
|
||||
see https://github.com/lstein/Perl-GD/pull/6
|
||||
|
||||
Index: b/Makefile.PL
|
||||
===================================================================
|
||||
--- a/Makefile.PL
|
||||
+++ b/Makefile.PL
|
||||
@@ -24,7 +24,15 @@
|
||||
my ($options,$lib_gd_path,$lib_ft_path,$lib_png_path,$lib_jpeg_path,$lib_xpm_path,$lib_zlib_path,$force);
|
||||
|
||||
use Getopt::Long;
|
||||
-GetOptions("ignore_missing_gd" => \$force);
|
||||
+my $result = GetOptions("options=s" => \$options,
|
||||
+ "lib_gd_path=s" => \$lib_gd_path,
|
||||
+ "lib_ft_path=s" => \$lib_ft_path,
|
||||
+ "lib_png_path=s" => \$lib_png_path,
|
||||
+ "lib_jpeg_path=s" => \$lib_jpeg_path,
|
||||
+ "lib_xpm_path=s" => \$lib_xpm_path,
|
||||
+ "lib_zlib_path=s" => \$lib_zlib_path,
|
||||
+ "ignore_missing_gd" => \$force,
|
||||
+ );
|
||||
|
||||
unless (try_to_autoconfigure(\$options,\$lib_gd_path,\@INC,\@LIBPATH,\@LIBS) || $force) {
|
||||
die <<END;
|
||||
@@ -47,14 +55,6 @@
|
||||
#############################################################################################
|
||||
# Build options passed in to script to support reproducible builds via Makefiles
|
||||
#############################################################################################
|
||||
-my $result = GetOptions("options=s" => \$options,
|
||||
- "lib_gd_path=s" => \$lib_gd_path,
|
||||
- "lib_ft_path=s" => \$lib_ft_path,
|
||||
- "lib_png_path=s" => \$lib_png_path,
|
||||
- "lib_jpeg_path=s" => \$lib_jpeg_path,
|
||||
- "lib_xpm_path=s" => \$lib_xpm_path,
|
||||
- "lib_zlib_path=s" => \$lib_zlib_path,
|
||||
- );
|
||||
unless ($result) {
|
||||
print STDERR <<END;
|
||||
Usage: perl Makefile.PL [options]
|
||||
28
deprecated/firmware/buildroot/package/perl-gd/0002-lgd.patch
Normal file
28
deprecated/firmware/buildroot/package/perl-gd/0002-lgd.patch
Normal file
@@ -0,0 +1,28 @@
|
||||
refactor -lgd in @LIBS
|
||||
|
||||
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
|
||||
see https://github.com/lstein/Perl-GD/pull/7
|
||||
|
||||
Index: b/Makefile.PL
|
||||
===================================================================
|
||||
--- a/Makefile.PL
|
||||
+++ b/Makefile.PL
|
||||
@@ -34,9 +34,9 @@
|
||||
END
|
||||
}
|
||||
|
||||
+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;
|
||||
-@LIBS = qw(-lgd) unless @LIBS;
|
||||
|
||||
# support for AMD64 libraries
|
||||
if (-d '/usr/lib64') {
|
||||
@@ -291,7 +291,6 @@
|
||||
@$LIBPATH = map {s/^-L// && "-L$_"} split /\s+/,$ldflags;
|
||||
@$LIBS = split /\s+/,$libs;
|
||||
|
||||
- push @$LIBS,"-lgd";
|
||||
push @$LIBPATH,"-L$libdir";
|
||||
($$lib_gd_path = $libdir) =~ s!/[^/]+$!!;
|
||||
$$options = $features;
|
||||
@@ -0,0 +1,32 @@
|
||||
let @INC and @LIBPATH empty when ignore_missing_gd
|
||||
|
||||
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
|
||||
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);
|
||||
+ }
|
||||
}
|
||||
|
||||
#############################################################################################
|
||||
@@ -0,0 +1,67 @@
|
||||
From f417f38929fe558d388b9a9343da9b2c0e6984aa Mon Sep 17 00:00:00 2001
|
||||
From: Romain Naour <romain.naour@openwide.fr>
|
||||
Date: Sat, 20 Dec 2014 23:22:41 +0100
|
||||
Subject: [PATCH] Makefile.PL: gdlib-config is now configurable
|
||||
|
||||
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
|
||||
---
|
||||
Makefile.PL | 15 +++++++++++++--
|
||||
1 file changed, 13 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Makefile.PL b/Makefile.PL
|
||||
index dfe8ad7..0fa6ef3 100644
|
||||
--- a/Makefile.PL
|
||||
+++ b/Makefile.PL
|
||||
@@ -21,7 +21,7 @@ END
|
||||
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,$force,$gdlib_config_path);
|
||||
|
||||
use Getopt::Long;
|
||||
my $result = GetOptions("options=s" => \$options,
|
||||
@@ -32,6 +32,7 @@ my $result = GetOptions("options=s" => \$options,
|
||||
"lib_xpm_path=s" => \$lib_xpm_path,
|
||||
"lib_zlib_path=s" => \$lib_zlib_path,
|
||||
"ignore_missing_gd" => \$force,
|
||||
+ "gdlib_config_path=s" => \$gdlib_config_path,
|
||||
);
|
||||
|
||||
unless (try_to_autoconfigure(\$options,\$lib_gd_path,\@INC,\@LIBPATH,\@LIBS) || $force) {
|
||||
@@ -72,6 +73,7 @@ Configure GD module.
|
||||
-lib_xpm_path path path to libxpm
|
||||
-lib_zlib_path path path to libpng
|
||||
-ignore_missing_gd Ignore missing or old libgd installations and try to compile anyway
|
||||
+ -gdlib_config_path path path to gdlib-config
|
||||
|
||||
If no options are passed on the command line. The program will
|
||||
attempt to autoconfigure itself with the gdlib-config program (present
|
||||
@@ -118,6 +120,15 @@ if( defined($lib_zlib_path) )
|
||||
@INC = ("-I$lib_zlib_path/include", @INC);
|
||||
@LIBPATH = ("-L$lib_zlib_path/lib", @LIBPATH);
|
||||
}
|
||||
+if( defined($gdlib_config_path) )
|
||||
+{
|
||||
+ print "gdlib-config used: $gdlib_config_path\n";
|
||||
+}
|
||||
+else
|
||||
+{
|
||||
+ $gdlib_config_path = "gdlib-config";
|
||||
+ print "$gdlib_config_path used from the PATH\n";
|
||||
+}
|
||||
#############################################################################################
|
||||
|
||||
if ($^O eq 'VMS'){
|
||||
@@ -275,7 +286,7 @@ exit 0;
|
||||
|
||||
sub try_to_autoconfigure {
|
||||
my ($options,$lib_gd_path,$INC,$LIBPATH,$LIBS) = @_;
|
||||
- my $config = `gdlib-config --all`;
|
||||
+ my $config = `$gdlib_config_path --all`;
|
||||
return unless $config;
|
||||
$AUTOCONFIG++;
|
||||
|
||||
--
|
||||
1.9.3
|
||||
|
||||
14
deprecated/firmware/buildroot/package/perl-gd/Config.in
Normal file
14
deprecated/firmware/buildroot/package/perl-gd/Config.in
Normal file
@@ -0,0 +1,14 @@
|
||||
config BR2_PACKAGE_PERL_GD
|
||||
bool "perl-gd"
|
||||
depends on !BR2_STATIC_LIBS
|
||||
select BR2_PACKAGE_ZLIB
|
||||
select BR2_PACKAGE_LIBPNG
|
||||
select BR2_PACKAGE_FREETYPE
|
||||
select BR2_PACKAGE_GD
|
||||
help
|
||||
Interface to Gd Graphics Library
|
||||
|
||||
https://metacpan.org/release/GD
|
||||
|
||||
comment "perl-gd needs a toolchain w/ dynamic library"
|
||||
depends on BR2_STATIC_LIBS
|
||||
@@ -0,0 +1,3 @@
|
||||
# retrieved by scancpan from http://cpan.metacpan.org/
|
||||
md5 d2c9b18123bcaff8672eb50f2eb37ed3 GD-2.53.tar.gz
|
||||
sha256 d05d01fe95e581adb3468cf05ab5d405db7497c0fb3ec7ecf23d023705fab7aa GD-2.53.tar.gz
|
||||
23
deprecated/firmware/buildroot/package/perl-gd/perl-gd.mk
Normal file
23
deprecated/firmware/buildroot/package/perl-gd/perl-gd.mk
Normal file
@@ -0,0 +1,23 @@
|
||||
################################################################################
|
||||
#
|
||||
# perl-gd
|
||||
#
|
||||
################################################################################
|
||||
|
||||
PERL_GD_VERSION = 2.53
|
||||
PERL_GD_SOURCE = GD-$(PERL_GD_VERSION).tar.gz
|
||||
PERL_GD_SITE = $(BR2_CPAN_MIRROR)/authors/id/L/LD/LDS
|
||||
PERL_GD_DEPENDENCIES = zlib libpng freetype gd
|
||||
PERL_GD_LICENSE = Artistic-2.0 or GPLv1+
|
||||
PERL_GD_LICENSE_FILES = LICENSE
|
||||
|
||||
PERL_GD_CONF_OPTS = \
|
||||
-options=FT,PNG \
|
||||
-lib_gd_path=$(STAGING_DIR)/usr \
|
||||
-lib_ft_path=$(STAGING_DIR)/usr \
|
||||
-lib_png_path=$(STAGING_DIR)/usr \
|
||||
-lib_zlib_path=$(STAGING_DIR)/usr \
|
||||
-ignore_missing_gd \
|
||||
-gdlib=$(STAGING_DIR)/usr/bin/gdlib-config
|
||||
|
||||
$(eval $(perl-package))
|
||||
Reference in New Issue
Block a user