• Skip to sidebar navigation
  • Skip to content

Bitbucket

  • More
    ProjectsRepositories
  • Help
    • Online help
    • Learn Git
    • Welcome to Bitbucket
    • Keyboard shortcuts
  • Log In
Alexander Dahl
  1. Alexander Dahl

buildroot

Public
Actions
  • Clone
  • Compare

Learn more about cloning repositories

You have read-only access

Navigation
  • Source
  • Commits
  • Branches
  • All Branches Graph
  • Forks
  1. Alexander Dahl
  2. buildroot

Source

buildroot/package/perl-gd/0001-getoptions.patch
Romain NaourRomain Naour committed c700796388221 Dec 2014
Raw file
Source viewDiff to previous
 
1
fix option handling in Makefile.PL
2
​
3
the call to GetOptions() must be unique.
4
​
5
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
6
see https://github.com/lstein/Perl-GD/pull/6
7
​
8
Index: b/Makefile.PL
9
===================================================================
10
--- a/Makefile.PL
11
+++ b/Makefile.PL
12
@@ -24,7 +24,15 @@
13
 my ($options,$lib_gd_path,$lib_ft_path,$lib_png_path,$lib_jpeg_path,$lib_xpm_path,$lib_zlib_path,$force);
14
 
15
 use Getopt::Long;
16
-GetOptions("ignore_missing_gd" => \$force);
17
+my $result = GetOptions("options=s"         => \$options,
18
+           "lib_gd_path=s"     => \$lib_gd_path,
19
+           "lib_ft_path=s"     => \$lib_ft_path,
20
+           "lib_png_path=s"    => \$lib_png_path,
21
+           "lib_jpeg_path=s"   => \$lib_jpeg_path,
22
+           "lib_xpm_path=s"    => \$lib_xpm_path,
23
+           "lib_zlib_path=s"   => \$lib_zlib_path,
24
+           "ignore_missing_gd" => \$force,
25
+              );
26
 
27
 unless (try_to_autoconfigure(\$options,\$lib_gd_path,\@INC,\@LIBPATH,\@LIBS) || $force) {
28
     die <<END;
29
@@ -47,14 +55,6 @@
30
 #############################################################################################
31
 # Build options passed in to script to support reproducible builds via Makefiles
32
 #############################################################################################
33
-my $result = GetOptions("options=s"       => \$options,
34
-           "lib_gd_path=s"   => \$lib_gd_path,
35
-           "lib_ft_path=s"   => \$lib_ft_path,
36
-           "lib_png_path=s"  => \$lib_png_path,
37
-           "lib_jpeg_path=s" => \$lib_jpeg_path,
38
-           "lib_xpm_path=s"  => \$lib_xpm_path,
39
-           "lib_zlib_path=s" => \$lib_zlib_path,
40
-              );
41
 unless ($result) {
42
   print STDERR <<END;
43
 Usage: perl Makefile.PL [options]
  • Git repository management for enterprise teams powered by Atlassian Bitbucket
  • Atlassian Bitbucket v6.7.2
  • Documentation
  • Request a feature
  • About
  • Contact Atlassian
Atlassian

Everything looks good. We'll let you know here if there's anything you should know about.