From 4e793461e96a2b4fd81142ab312d074d5c8841fa Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sat, 23 Jul 2016 18:41:10 -0700 Subject: [PATCH] CHANGES: BUG: 2712: Fix Perl module compilation Avoid that building the Net-SNMP Perl modules fails as follows: ERROR from evaluation of /sources/net-snmp-5.7.3/perl/ASN/Makefile.PL: Bizarre \ copy of HASH in list assignment at /usr/lib/perl5/site_perl/5.24.0/Carp.pm line\ 229. See also https://sourceforge.net/p/net-snmp/bugs/2712/. --- perl/ASN/Makefile.PL | 4 +--- perl/Makefile.PL | 4 +--- perl/OID/Makefile.PL | 5 +---- perl/SNMP/Makefile.PL | 5 +---- perl/TrapReceiver/Makefile.PL | 5 +---- perl/agent/Makefile.PL | 5 +---- perl/agent/Support/Makefile.PL | 5 +---- perl/agent/default_store/Makefile.PL | 5 +---- perl/default_store/Makefile.PL | 6 +----- 9 files changed, 9 insertions(+), 35 deletions(-) diff --git a/perl/ASN/Makefile.PL b/perl/ASN/Makefile.PL index f895a41..0e52b3a 100644 --- a/perl/ASN/Makefile.PL +++ b/perl/ASN/Makefile.PL @@ -7,9 +7,7 @@ my $lib_version; # See lib/ExtUtils/MakeMaker.pm for details of how to influence # the contents of the Makefile that is written. -%MakeParams = InitMakeParams(); - -WriteMakefile(%MakeParams); +WriteMakefile(InitMakeParams()); Check_Version(); diff --git a/perl/Makefile.PL b/perl/Makefile.PL index f70f991..ac36c15 100644 --- a/perl/Makefile.PL +++ b/perl/Makefile.PL @@ -3,9 +3,7 @@ use Config; use Getopt::Long; require 5; -%MakeParams = InitMakeParams(); - -WriteMakefile(%MakeParams); +WriteMakefile(InitMakeParams()); sub InitMakeParams { $nsconfig="net-snmp-config"; # in path by default diff --git a/perl/OID/Makefile.PL b/perl/OID/Makefile.PL index 5d94338..676c439 100644 --- a/perl/OID/Makefile.PL +++ b/perl/OID/Makefile.PL @@ -6,11 +6,8 @@ require 5; use Config; use Getopt::Long; my $lib_version; -my %MakeParams = (); -%MakeParams = InitMakeParams(); - -WriteMakefile(%MakeParams); +WriteMakefile(InitMakeParams()); Check_Version(); diff --git a/perl/SNMP/Makefile.PL b/perl/SNMP/Makefile.PL index 928cb67..d7b5a2a 100644 --- a/perl/SNMP/Makefile.PL +++ b/perl/SNMP/Makefile.PL @@ -3,15 +3,12 @@ require 5; use Config; use Getopt::Long; my $lib_version; -my %MakeParams = (); my $opts; # See lib/ExtUtils/MakeMaker.pm for details of how to influence # the contents of the Makefile that is written. -%MakeParams = InitMakeParams(); - -WriteMakefile(%MakeParams); +WriteMakefile(InitMakeParams()); Check_Version(); diff --git a/perl/TrapReceiver/Makefile.PL b/perl/TrapReceiver/Makefile.PL index 5c9463a..0af6aaf 100644 --- a/perl/TrapReceiver/Makefile.PL +++ b/perl/TrapReceiver/Makefile.PL @@ -3,11 +3,8 @@ require 5; use Config; use Getopt::Long; my $lib_version; -my %MakeParams = (); -%MakeParams = InitMakeParams(); - -WriteMakefile(%MakeParams); +WriteMakefile(InitMakeParams()); Check_Version(); diff --git a/perl/agent/Makefile.PL b/perl/agent/Makefile.PL index b4b358a..fe105ea 100644 --- a/perl/agent/Makefile.PL +++ b/perl/agent/Makefile.PL @@ -3,11 +3,8 @@ require 5; use Config; use Getopt::Long; my $lib_version; -my %MakeParams = (); -%MakeParams = InitMakeParams(); - -WriteMakefile(%MakeParams); +WriteMakefile(InitMakeParams()); Check_Version(); diff --git a/perl/agent/Support/Makefile.PL b/perl/agent/Support/Makefile.PL index 3a4f200..0dcb3f6 100644 --- a/perl/agent/Support/Makefile.PL +++ b/perl/agent/Support/Makefile.PL @@ -3,14 +3,11 @@ require 5; use Config; use Getopt::Long; my $lib_version; -my %MakeParams = (); # See lib/ExtUtils/MakeMaker.pm for details of how to influence # the contents of the Makefile that is written. -%MakeParams = InitMakeParams(); - -WriteMakefile(%MakeParams); +WriteMakefile(InitMakeParams()); Check_Version(); diff --git a/perl/agent/default_store/Makefile.PL b/perl/agent/default_store/Makefile.PL index 67d5ff0..5c6a5d6 100644 --- a/perl/agent/default_store/Makefile.PL +++ b/perl/agent/default_store/Makefile.PL @@ -3,11 +3,8 @@ require 5; use Config; use Getopt::Long; my $lib_version; -my %MakeParams = (); -%MakeParams = InitMakeParams(); - -WriteMakefile(%MakeParams); +WriteMakefile(InitMakeParams()); Check_Version(); diff --git a/perl/default_store/Makefile.PL b/perl/default_store/Makefile.PL index 54996ab..221d4ed 100644 --- a/perl/default_store/Makefile.PL +++ b/perl/default_store/Makefile.PL @@ -3,12 +3,8 @@ require 5; use Config; use Getopt::Long; my $lib_version; -my %MakeParams = (); - -%MakeParams = InitMakeParams(); - -WriteMakefile(%MakeParams); +WriteMakefile(InitMakeParams()); sub InitMakeParams { my $opts; -- 2.10.0