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