Patchwork openjade-native: Use Getopt::Std in place of getopts.pl.

login
register
mail settings
Submitter Dennis Lan
Date June 27, 2012, 9:53 p.m.
Message ID <1340834004-3614-1-git-send-email-dennis.yxun@gmail.com>
Download mbox | patch
Permalink /patch/30769/
State New
Headers show

Comments

Dennis Lan - June 27, 2012, 9:53 p.m.
Using Gentoo Linux as the build host, it fails without this patch
https://bugs.gentoo.org/show_bug.cgi?id=420083

which following error:

/usr/bin/perl -w ./../msggen.pl -l jstyleModule InterpreterMessages.msg
/usr/bin/perl -w ./../msggen.pl -l jstyleModule DssslAppMessages.msg
Undefined subroutine &main::Getopts called at ./../msggen.pl line 22.
make[2]: *** [InterpreterMessages.h] Error 2
make[2]: *** Waiting for unfinished jobs....
Undefined subroutine &main::Getopts called at ./../msggen.pl line 22.
make[2]: *** [DssslAppMessages.h] Error 2
---
 .../openjade/openjade-1.3.2/msggen.pl.patch        |   32 ++++++++++++++++++++
 .../openjade/openjade-native_1.3.2.bb              |    1 +
 2 files changed, 33 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-devtools/openjade/openjade-1.3.2/msggen.pl.patch
Saul Wold - June 27, 2012, 10:14 p.m.
On 06/27/2012 02:53 PM, Dennis Lan wrote:
> Using Gentoo Linux as the build host, it fails without this patch
> https://bugs.gentoo.org/show_bug.cgi?id=420083
>
> which following error:
>
> /usr/bin/perl -w ./../msggen.pl -l jstyleModule InterpreterMessages.msg
> /usr/bin/perl -w ./../msggen.pl -l jstyleModule DssslAppMessages.msg
> Undefined subroutine&main::Getopts called at ./../msggen.pl line 22.
> make[2]: *** [InterpreterMessages.h] Error 2
> make[2]: *** Waiting for unfinished jobs....
> Undefined subroutine&main::Getopts called at ./../msggen.pl line 22.
> make[2]: *** [DssslAppMessages.h] Error 2
> ---
>   .../openjade/openjade-1.3.2/msggen.pl.patch        |   32 ++++++++++++++++++++
>   .../openjade/openjade-native_1.3.2.bb              |    1 +
>   2 files changed, 33 insertions(+), 0 deletions(-)
>   create mode 100644 meta/recipes-devtools/openjade/openjade-1.3.2/msggen.pl.patch
>
> diff --git a/meta/recipes-devtools/openjade/openjade-1.3.2/msggen.pl.patch b/meta/recipes-devtools/openjade/openjade-1.3.2/msggen.pl.patch
> new file mode 100644
> index 0000000..1afe68b
> --- /dev/null
> +++ b/meta/recipes-devtools/openjade/openjade-1.3.2/msggen.pl.patch

The patch needs a header also, with comment, Upstream-status and 
Signed-off-by:

Please see further details at:

http://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines

Thanks
	Sau!
> @@ -0,0 +1,32 @@
> +Use Getopt::Std in place of getopts.pl.
> +https://bugs.gentoo.org/show_bug.cgi?id=420083
> +
> +--- a/msggen.pl
> ++++ b/msggen.pl
> +@@ -4,6 +4,7 @@
> + # See the file COPYING for copying permission.
> +
> + use POSIX;
> ++use Getopt::Std;
> +
> + # Package and version.
> + $package = 'openjade';
> +@@ -18,8 +19,7 @@
> + undef $opt_l;
> + undef $opt_p;
> + undef $opt_t;
> +-do 'getopts.pl';
> +-&Getopts('l:p:t:');
> ++getopts('l:p:t:');
> + $module = $opt_l;
> + $pot_file = $opt_p;
> +
> +@@ -72,7 +72,7 @@
> +     else {
> + 	$field[0] =~ /^[IWQXE][0-9]$/ ||&error("invalid first field");;
> + 	$type[$num] = substr($field[0], 0, 1);
> +-	$argc = int(substr($field[0], 1, 1));
> ++	$argc = substr($field[0], 1, 1);
> +     }
> +     $nargs[$num] = $argc;
> +     $field[1] =~ /^[a-zA-Z_][a-zA-Z0-9_]+$/ ||&error("invalid tag");
> diff --git a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
> index 5b29c1f..efd1e11 100644
> --- a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
> +++ b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
> @@ -14,6 +14,7 @@ RDEPENDS_${PN} = "sgml-common-native"
>
>   SRC_URI = "${SOURCEFORGE_MIRROR}/openjade/openjade-${PV}.tar.gz \
>              file://makefile.patch \
> +           file://msggen.pl.patch \
>              file://reautoconf.patch \
>   	   file://user-declared-default-constructor.patch"
>
Dennis Lan - June 27, 2012, 11:27 p.m.
ok, thanks for pointing out
will cook another patch and resend as r2

On Thu, Jun 28, 2012 at 6:14 AM, Saul Wold <sgw@linux.intel.com> wrote:
> On 06/27/2012 02:53 PM, Dennis Lan wrote:
>>
>> Using Gentoo Linux as the build host, it fails without this patch
>> https://bugs.gentoo.org/show_bug.cgi?id=420083
>>
>> which following error:
>>
>> /usr/bin/perl -w ./../msggen.pl -l jstyleModule InterpreterMessages.msg
>> /usr/bin/perl -w ./../msggen.pl -l jstyleModule DssslAppMessages.msg
>> Undefined subroutine&main::Getopts called at ./../msggen.pl line 22.
>>
>> make[2]: *** [InterpreterMessages.h] Error 2
>> make[2]: *** Waiting for unfinished jobs....
>> Undefined subroutine&main::Getopts called at ./../msggen.pl line 22.
>>
>> make[2]: *** [DssslAppMessages.h] Error 2
>> ---
>>  .../openjade/openjade-1.3.2/msggen.pl.patch        |   32
>> ++++++++++++++++++++
>>  .../openjade/openjade-native_1.3.2.bb              |    1 +
>>  2 files changed, 33 insertions(+), 0 deletions(-)
>>  create mode 100644
>> meta/recipes-devtools/openjade/openjade-1.3.2/msggen.pl.patch
>>
>> diff --git a/meta/recipes-devtools/openjade/openjade-1.3.2/msggen.pl.patch
>> b/meta/recipes-devtools/openjade/openjade-1.3.2/msggen.pl.patch
>> new file mode 100644
>> index 0000000..1afe68b
>> --- /dev/null
>> +++ b/meta/recipes-devtools/openjade/openjade-1.3.2/msggen.pl.patch
>
>
> The patch needs a header also, with comment, Upstream-status and
> Signed-off-by:
>
> Please see further details at:
>
> http://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
>
> Thanks
>        Sau!
>
>> @@ -0,0 +1,32 @@
>> +Use Getopt::Std in place of getopts.pl.
>> +https://bugs.gentoo.org/show_bug.cgi?id=420083
>> +
>> +--- a/msggen.pl
>> ++++ b/msggen.pl
>> +@@ -4,6 +4,7 @@
>> + # See the file COPYING for copying permission.
>> +
>> + use POSIX;
>> ++use Getopt::Std;
>> +
>> + # Package and version.
>> + $package = 'openjade';
>> +@@ -18,8 +19,7 @@
>> + undef $opt_l;
>> + undef $opt_p;
>> + undef $opt_t;
>> +-do 'getopts.pl';
>> +-&Getopts('l:p:t:');
>> ++getopts('l:p:t:');
>> + $module = $opt_l;
>> + $pot_file = $opt_p;
>> +
>> +@@ -72,7 +72,7 @@
>> +     else {
>> +       $field[0] =~ /^[IWQXE][0-9]$/ ||&error("invalid first field");;
>> +       $type[$num] = substr($field[0], 0, 1);
>> +-      $argc = int(substr($field[0], 1, 1));
>> ++      $argc = substr($field[0], 1, 1);
>> +     }
>> +     $nargs[$num] = $argc;
>> +     $field[1] =~ /^[a-zA-Z_][a-zA-Z0-9_]+$/ ||&error("invalid tag");
>> diff --git a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
>> b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
>> index 5b29c1f..efd1e11 100644
>> --- a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
>> +++ b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
>> @@ -14,6 +14,7 @@ RDEPENDS_${PN} = "sgml-common-native"
>>
>>  SRC_URI = "${SOURCEFORGE_MIRROR}/openjade/openjade-${PV}.tar.gz \
>>             file://makefile.patch \
>> +           file://msggen.pl.patch \
>>             file://reautoconf.patch \
>>           file://user-declared-default-constructor.patch"
>>
>
Chris Larson - June 28, 2012, 2:19 a.m.
On Wed, Jun 27, 2012 at 4:27 PM, Dennis.Yxun <dennis.yxun@gmail.com> wrote:
> ok, thanks for pointing out
> will cook another patch and resend as r2


I got bit by this one on Arch as well. Thanks for putting together the fix.

Patch

diff --git a/meta/recipes-devtools/openjade/openjade-1.3.2/msggen.pl.patch b/meta/recipes-devtools/openjade/openjade-1.3.2/msggen.pl.patch
new file mode 100644
index 0000000..1afe68b
--- /dev/null
+++ b/meta/recipes-devtools/openjade/openjade-1.3.2/msggen.pl.patch
@@ -0,0 +1,32 @@ 
+Use Getopt::Std in place of getopts.pl.
+https://bugs.gentoo.org/show_bug.cgi?id=420083
+
+--- a/msggen.pl
++++ b/msggen.pl
+@@ -4,6 +4,7 @@
+ # See the file COPYING for copying permission.
+ 
+ use POSIX;
++use Getopt::Std;
+ 
+ # Package and version.
+ $package = 'openjade';
+@@ -18,8 +19,7 @@
+ undef $opt_l;
+ undef $opt_p;
+ undef $opt_t;
+-do 'getopts.pl';
+-&Getopts('l:p:t:');
++getopts('l:p:t:');
+ $module = $opt_l;
+ $pot_file = $opt_p;
+ 
+@@ -72,7 +72,7 @@
+     else {
+ 	$field[0] =~ /^[IWQXE][0-9]$/ || &error("invalid first field");;
+ 	$type[$num] = substr($field[0], 0, 1);
+-	$argc = int(substr($field[0], 1, 1));
++	$argc = substr($field[0], 1, 1);
+     }
+     $nargs[$num] = $argc;
+     $field[1] =~ /^[a-zA-Z_][a-zA-Z0-9_]+$/ || &error("invalid tag");
diff --git a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
index 5b29c1f..efd1e11 100644
--- a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
+++ b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
@@ -14,6 +14,7 @@  RDEPENDS_${PN} = "sgml-common-native"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/openjade/openjade-${PV}.tar.gz \
            file://makefile.patch \
+           file://msggen.pl.patch \
            file://reautoconf.patch \
 	   file://user-declared-default-constructor.patch"