Commit 39d1f064 authored by Francois Perrad's avatar Francois Perrad Committed by Thomas Petazzoni
Browse files

perl-gd: new package 



Signed-off-by: default avatarFrancois Perrad <francois.perrad@gadz.org>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 6d3962f0

package/Config.in

+1 −0
Original line number Diff line number Diff line
@@ -430,6 +430,7 @@ endif 
	source "package/perl/Config.in"

if BR2_PACKAGE_PERL

menu "Perl libraries/modules"

	source "package/perl-gd/Config.in"

	source "package/perl-io-socket-ssl/Config.in"

	source "package/perl-mojolicious/Config.in"

	source "package/perl-net-ssleay/Config.in"

package/perl-gd/Config.in

0 → 100644
+14 −0
Original line number Diff line number Diff line 
config BR2_PACKAGE_PERL_GD

	bool "perl-gd"

	depends on !BR2_PREFER_STATIC_LIB

	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_PREFER_STATIC_LIB

package/perl-gd/perl-gd-01-getoptions.patch

0 → 100644
+40 −0
Original line number Diff line number Diff line 
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,

-		       );

package/perl-gd/perl-gd-02-lgd.patch

0 → 100644
+25 −0
Original line number Diff line number Diff line 
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";

package/perl-gd/perl-gd-03-force.patch

0 → 100644
+29 −0
Original line number Diff line number Diff line 
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);

+  }