1 From 4e793461e96a2b4fd81142ab312d074d5c8841fa Mon Sep 17 00:00:00 2001
2 From: Bart Van Assche <bvanassche@acm.org>
3 Date: Sat, 23 Jul 2016 18:41:10 -0700
4 Subject: [PATCH] CHANGES: BUG: 2712: Fix Perl module compilation
5
6 Avoid that building the Net-SNMP Perl modules fails as follows:
7
8 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.
9
10 See also https://sourceforge.net/p/net-snmp/bugs/2712/.
11 ---
12 perl/ASN/Makefile.PL | 4 +---
13 perl/Makefile.PL | 4 +---
14 perl/OID/Makefile.PL | 5 +----
15 perl/SNMP/Makefile.PL | 5 +----
16 perl/TrapReceiver/Makefile.PL | 5 +----
17 perl/agent/Makefile.PL | 5 +----
18 perl/agent/Support/Makefile.PL | 5 +----
19 perl/agent/default_store/Makefile.PL | 5 +----
20 perl/default_store/Makefile.PL | 6 +-----
21 9 files changed, 9 insertions(+), 35 deletions(-)
22
23 diff --git a/perl/ASN/Makefile.PL b/perl/ASN/Makefile.PL
24 index f895a41..0e52b3a 100644
25 --- a/perl/ASN/Makefile.PL
26 +++ b/perl/ASN/Makefile.PL
27 @@ -7,9 +7,7 @@ my $lib_version;
28 # See lib/ExtUtils/MakeMaker.pm for details of how to influence
29 # the contents of the Makefile that is written.
30
31 -%MakeParams = InitMakeParams();
32 -
33 -WriteMakefile(%MakeParams);
34 +WriteMakefile(InitMakeParams());
35
36 Check_Version();
37
38 diff --git a/perl/Makefile.PL b/perl/Makefile.PL
39 index f70f991..ac36c15 100644
40 --- a/perl/Makefile.PL
41 +++ b/perl/Makefile.PL
42 @@ -3,9 +3,7 @@ use Config;
43 use Getopt::Long;
44 require 5;
45
46 -%MakeParams = InitMakeParams();
47 -
48 -WriteMakefile(%MakeParams);
49 +WriteMakefile(InitMakeParams());
50
51 sub InitMakeParams {
52 $nsconfig="net-snmp-config"; # in path by default
53 diff --git a/perl/OID/Makefile.PL b/perl/OID/Makefile.PL
54 index 5d94338..676c439 100644
55 --- a/perl/OID/Makefile.PL
56 +++ b/perl/OID/Makefile.PL
57 @@ -6,11 +6,8 @@ require 5;
58 use Config;
59 use Getopt::Long;
60 my $lib_version;
61 -my %MakeParams = ();
62
63 -%MakeParams = InitMakeParams();
64 -
65 -WriteMakefile(%MakeParams);
66 +WriteMakefile(InitMakeParams());
67
68 Check_Version();
69
70 diff --git a/perl/SNMP/Makefile.PL b/perl/SNMP/Makefile.PL
71 index 928cb67..d7b5a2a 100644
72 --- a/perl/SNMP/Makefile.PL
73 +++ b/perl/SNMP/Makefile.PL
74 @@ -3,15 +3,12 @@ require 5;
75 use Config;
76 use Getopt::Long;
77 my $lib_version;
78 -my %MakeParams = ();
79 my $opts;
80
81 # See lib/ExtUtils/MakeMaker.pm for details of how to influence
82 # the contents of the Makefile that is written.
83
84 -%MakeParams = InitMakeParams();
85 -
86 -WriteMakefile(%MakeParams);
87 +WriteMakefile(InitMakeParams());
88
89 Check_Version();
90
91 diff --git a/perl/TrapReceiver/Makefile.PL b/perl/TrapReceiver/Makefile.PL
92 index 5c9463a..0af6aaf 100644
93 --- a/perl/TrapReceiver/Makefile.PL
94 +++ b/perl/TrapReceiver/Makefile.PL
95 @@ -3,11 +3,8 @@ require 5;
96 use Config;
97 use Getopt::Long;
98 my $lib_version;
99 -my %MakeParams = ();
100
101 -%MakeParams = InitMakeParams();
102 -
103 -WriteMakefile(%MakeParams);
104 +WriteMakefile(InitMakeParams());
105
106 Check_Version();
107
108 diff --git a/perl/agent/Makefile.PL b/perl/agent/Makefile.PL
109 index b4b358a..fe105ea 100644
110 --- a/perl/agent/Makefile.PL
111 +++ b/perl/agent/Makefile.PL
112 @@ -3,11 +3,8 @@ require 5;
113 use Config;
114 use Getopt::Long;
115 my $lib_version;
116 -my %MakeParams = ();
117
118 -%MakeParams = InitMakeParams();
119 -
120 -WriteMakefile(%MakeParams);
121 +WriteMakefile(InitMakeParams());
122
123 Check_Version();
124
125 diff --git a/perl/agent/Support/Makefile.PL b/perl/agent/Support/Makefile.PL
126 index 3a4f200..0dcb3f6 100644
127 --- a/perl/agent/Support/Makefile.PL
128 +++ b/perl/agent/Support/Makefile.PL
129 @@ -3,14 +3,11 @@ require 5;
130 use Config;
131 use Getopt::Long;
132 my $lib_version;
133 -my %MakeParams = ();
134
135 # See lib/ExtUtils/MakeMaker.pm for details of how to influence
136 # the contents of the Makefile that is written.
137
138 -%MakeParams = InitMakeParams();
139 -
140 -WriteMakefile(%MakeParams);
141 +WriteMakefile(InitMakeParams());
142
143 Check_Version();
144
145 diff --git a/perl/agent/default_store/Makefile.PL b/perl/agent/default_store/Makefile.PL
146 index 67d5ff0..5c6a5d6 100644
147 --- a/perl/agent/default_store/Makefile.PL
148 +++ b/perl/agent/default_store/Makefile.PL
149 @@ -3,11 +3,8 @@ require 5;
150 use Config;
151 use Getopt::Long;
152 my $lib_version;
153 -my %MakeParams = ();
154
155 -%MakeParams = InitMakeParams();
156 -
157 -WriteMakefile(%MakeParams);
158 +WriteMakefile(InitMakeParams());
159
160 Check_Version();
161
162 diff --git a/perl/default_store/Makefile.PL b/perl/default_store/Makefile.PL
163 index 54996ab..221d4ed 100644
164 --- a/perl/default_store/Makefile.PL
165 +++ b/perl/default_store/Makefile.PL
166 @@ -3,12 +3,8 @@ require 5;
167 use Config;
168 use Getopt::Long;
169 my $lib_version;
170 -my %MakeParams = ();
171 -
172 -%MakeParams = InitMakeParams();
173 -
174 -WriteMakefile(%MakeParams);
175
176 +WriteMakefile(InitMakeParams());
177
178 sub InitMakeParams {
179 my $opts;
180 --
181 2.10.0
|
