package/perl-gd: rename patches to follow the new name convention
PATCH 1/2 package/perl-gd: rename patches to follow the new name convention
---
package/perl-gd/{perl-gd-01-getoptions.patch => 0001-getoptions.patch} | 0
package/perl-gd/{perl-gd-02-lgd.patch => 0002-lgd.patch} | 0
package/perl-gd/{perl-gd-03-force.patch => 0003-force.patch} | 0
3 files changed, 0 insertions(+), 0 deletions(-)
rename package/perl-gd/{perl-gd-01-getoptions.patch => 0001-getoptions.patch} (100%)
rename package/perl-gd/{perl-gd-02-lgd.patch => 0002-lgd.patch} (100%)
rename package/perl-gd/{perl-gd-03-force.patch => 0003-force.patch} (100%)package/perl-gd/0001-getoptions.patch renamed from package/perl-gd/perl-gd-01-getoptions.patch +0 -0
package/perl-gd/0002-lgd.patch renamed from package/perl-gd/perl-gd-02-lgd.patch +0 -0
package/perl-gd/0003-force.patch renamed from package/perl-gd/perl-gd-03-force.patch +0 -0
Signature · 1 line
1.9.3
RFC PATCH 2/2 package/perl-gd: Add a new option to set the path to gdlib-config
The build of perl-gd use the gdlib-config from the host that in result incorect features enabled, incorrect header and library paths.
Should fixes:
http://autobuild.buildroot.net/results/15c/15ce69b916167305aba2820a157c880e487ee8c7/
http://autobuild.buildroot.net/results/504/504d64d992eb504e02c127feb4734a917ad95d0a/
http://autobuild.buildroot.net/results/551/5512213c8861e51b390c1c223d53add0ec1ed758/
And many more.
Note:
In the generated Makefile, LDFLAGS still contains "-L/usr/local/lib"
--- .../0004-gdlib-config-is-now-configurable.patch | 67 ++++++++++++++++++++++ package/perl-gd/perl-gd.mk | 3 +- 2 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 package/perl-gd/0004-gdlib-config-is-now-configurable.patch
package/perl-gd/0004-gdlib-config-is-now-configurable.patch new file +67 -0
@@ -0,0 +1,67 @@ +From f417f38929fe558d388b9a9343da9b2c0e6984aa Mon Sep 17 00:00:00 2001 +From: Romain Naour <[email protected]> +Date: Sat, 20 Dec 2014 23:22:41 +0100 +Subject: [PATCH] Makefile.PL: gdlib-config is now configurable + +Signed-off-by: Romain Naour <[email protected]> +--- + 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, at LIBPATH, at 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 +
package/perl-gd/perl-gd.mk +2 -1
@@ -17,6 +17,7 @@ PERL_GD_CONF_OPTS = \ -lib_ft_path=$(STAGING_DIR)/usr \ -lib_png_path=$(STAGING_DIR)/usr \ -lib_zlib_path=$(STAGING_DIR)/usr \ - -ignore_missing_gd + -ignore_missing_gd \ + -gdlib=$(STAGING_DIR)/usr/bin/gdlib-config $(eval $(perl-package))
Signature · 1 line
1.9.3
RFC PATCH 2/2 package/perl-gd: Add a new option to set the path to gdlib-config
Dear Romain Naour,
Quoted 13 lines · Romain Naour
The build of perl-gd use the gdlib-config from the host that in result incorect features enabled, incorrect header and library paths.
Should fixes:
http://autobuild.buildroot.net/results/15c/15ce69b916167305aba2820a157c880e487ee8c7/
http://autobuild.buildroot.net/results/504/504d64d992eb504e02c127feb4734a917ad95d0a/
http://autobuild.buildroot.net/results/551/5512213c8861e51b390c1c223d53add0ec1ed758/And many more.
Note:
In the generatedMakefile, LDFLAGS still contains "-L/usr/local/lib"
Quoted 6 lines
Signed-off-by Romain Naour <[email protected]>--- .../0004-gdlib-config-is-now-configurable.patch | 67 ++++++++++++++++++++++ package/perl-gd/perl-gd.mk | 3 +- 2 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 package/perl-gd/0004-gdlib-config-is-now-configurable.patch
We have another patch from Fran?ois for the same issue, at
http://patchwork.ozlabs.org/patch/415924/. However, Peter raised some concerns about Fran?ois approach, and your patch indeed seems better.
Fran?ois, can you comment/review Romain's patch? See
http://patchwork.ozlabs.org/patch/423143/.
Romain, any chance you can submit your patch upstream?
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
RFC PATCH 2/2 package/perl-gd: Add a new option to set the path to gdlib-config
Hi Thomas,
Le 21/12/2014 13:20, Thomas Petazzoni a ?crit :
Quoted 22 lines
Dear Romain Naour,
Quoted 13 lines · Romain Naour
The build of perl-gd use the gdlib-config from the host that in result incorect features enabled, incorrect header and library paths.
Should fixes:
http://autobuild.buildroot.net/results/15c/15ce69b916167305aba2820a157c880e487ee8c7/
http://autobuild.buildroot.net/results/504/504d64d992eb504e02c127feb4734a917ad95d0a/
http://autobuild.buildroot.net/results/551/5512213c8861e51b390c1c223d53add0ec1ed758/And many more.
Note:
In the generatedMakefile, LDFLAGS still contains "-L/usr/local/lib"Quoted 6 lines
Signed-off-by Romain Naour <[email protected]>--- .../0004-gdlib-config-is-now-configurable.patch | 67 ++++++++++++++++++++++ package/perl-gd/perl-gd.mk | 3 +- 2 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 package/perl-gd/0004-gdlib-config-is-now-configurable.patch
Quoted 9 lines
We have another patch from Fran?ois for the same issue, at
http://patchwork.ozlabs.org/patch/415924/. However, Peter raised some concerns about Fran?ois approach, and your patch indeed seems better.Fran?ois, can you comment/review Romain's patch? See
http://patchwork.ozlabs.org/patch/423143/.Romain, any chance you can submit your patch upstream?
I'll do.
perl-gd upstream has added a new Build.PL file that has the same issues for cross-compiling. Also, Fran?ois's patches haven't been merged yet.
Best regards,
Romain Naour
RFC PATCH 2/2 package/perl-gd: Add a new option to set the path to gdlib-config
In reply to Thomas Petazzoni2014-12-21 13:20 GMT+01:00 Thomas Petazzoni
<[email protected]>:
Quoted 17 lines
Dear Romain Naour,
Quoted 14 lines · Romain Naour
The build of perl-gd use the gdlib-config from the host that in result incorect features enabled, incorrect header and library paths.
Should fixes:
http://autobuild.buildroot.net/results/15c/15ce69b916167305aba2820a157c880e487ee8c7/
http://autobuild.buildroot.net/results/504/504d64d992eb504e02c127feb4734a917ad95d0a/
http://autobuild.buildroot.net/results/551/5512213c8861e51b390c1c223d53add0ec1ed758/And many more.
Note:
In the generatedMakefile, LDFLAGS still contains "-L/usr/local/lib"Signed-off-by Romain Naour <[email protected]>
Quoted 22 lines
Quoted 5 lines
--- .../0004-gdlib-config-is-now-configurable.patch | 67 ++++++++++++++++++++++ package/perl-gd/perl-gd.mk | 3 +- 2 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 package/perl-gd/0004-gdlib-config-is-now-configurable.patchWe have another patch from Fran?ois for the same issue, at
http://patchwork.ozlabs.org/patch/415924/. However, Peter raised some concerns about Fran?ois approach, and your patch indeed seems better.Fran?ois, can you comment/review Romain's patch? See
http://patchwork.ozlabs.org/patch/423143/.Romain, any chance you can submit your patch upstream?
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
RFC PATCH 2/2 package/perl-gd: Add a new option to set the path to gdlib-config
In reply to Romain NaourDear Romain Naour,
Quoted 8 lines · Romain Naour
The build of perl-gd use the gdlib-config from the host that in result incorect features enabled, incorrect header and library paths.
Should fixes:
http://autobuild.buildroot.net/results/15c/15ce69b916167305aba2820a157c880e487ee8c7/
http://autobuild.buildroot.net/results/504/504d64d992eb504e02c127feb4734a917ad95d0a/
http://autobuild.buildroot.net/results/551/5512213c8861e51b390c1c223d53add0ec1ed758/
Quoted 6 lines
And many more.
Note:
In the generatedMakefile, LDFLAGS still contains "-L/usr/local/lib"Signed-off-by Romain Naour <[email protected]>
Applied, thanks. Thanks Fran?ois for the testing!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
Thomas Petazzoni
AppliedPATCH 1/2 package/perl-gd: rename patches to follow the new name convention
In reply to Romain NaourDear Romain Naour,
Quoted 9 lines · Romain Naour
Signed-off-by Romain Naour <[email protected]>--- package/perl-gd/{perl-gd-01-getoptions.patch => 0001-getoptions.patch} | 0 package/perl-gd/{perl-gd-02-lgd.patch => 0002-lgd.patch} | 0 package/perl-gd/{perl-gd-03-force.patch => 0003-force.patch} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename package/perl-gd/{perl-gd-01-getoptions.patch => 0001-getoptions.patch} (100%) rename package/perl-gd/{perl-gd-02-lgd.patch => 0002-lgd.patch} (100%) rename package/perl-gd/{perl-gd-03-force.patch => 0003-force.patch} (100%)
Applied, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com