diff options
| author | Dennis Lan <dennis.yxun@gmail.com> | 2012-07-03 07:03:46 +0000 | 
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-03 14:55:01 +0100 | 
| commit | 6121186ff9b1577b304bc237caa80e4207d04470 (patch) | |
| tree | 33a29ac6a6e8f9dfc72fcc34ab8ddd5fe31fc289 | |
| parent | 8c87f255c0b94f7dd4d17083c6d9def1dc01d26c (diff) | |
| download | poky-6121186ff9b1577b304bc237caa80e4207d04470.tar.gz | |
openjade-native: fix undefined Getopts error, use std namespace
Using Gentoo Linux as the build host, it fails without this patch
Use Getopt::Std in place of getopts.pl.
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
(From OE-Core rev: 169a89b10817b742c063fcd76721e4dbbcca6199)
Signed-off-by: Dennis Lan <dennis.yxun@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/openjade/openjade-1.3.2/msggen.pl.patch | 44 | ||||
| -rw-r--r-- | meta/recipes-devtools/openjade/openjade-native_1.3.2.bb | 3 | 
2 files changed, 46 insertions, 1 deletions
| 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 0000000000..b47fd4655f --- /dev/null +++ b/meta/recipes-devtools/openjade/openjade-1.3.2/msggen.pl.patch | |||
| @@ -0,0 +1,44 @@ | |||
| 1 | commit fcc5b94f118495b1a467edcda6c6f631691c3f69 | ||
| 2 | Author: Dennis Lan <dennis.yxun@gmail.com> | ||
| 3 | Date: Tue Jul 3 09:25:42 2012 +0800 | ||
| 4 | |||
| 5 | openjade: fix undefined Getopts error, use std namespace | ||
| 6 | |||
| 7 | Using Gentoo Linux as the build host, it fails without this patch | ||
| 8 | Use Getopt::Std in place of getopts.pl. | ||
| 9 | |||
| 10 | Upstream-Status: Inappropriate [no upstream] | ||
| 11 | Original-Author-By: Mike Gilbert <floppym@gentoo.org> | ||
| 12 | Signed-off-by: Dennis Lan <dennis.yxun@gmail.com> | ||
| 13 | |||
| 14 | diff --git a/msggen.pl b/msggen.pl | ||
| 15 | index 0c33968..2ee3f66 100644 | ||
| 16 | --- a/msggen.pl | ||
| 17 | +++ b/msggen.pl | ||
| 18 | @@ -4,6 +4,7 @@ | ||
| 19 | # See the file COPYING for copying permission. | ||
| 20 | |||
| 21 | use POSIX; | ||
| 22 | +use Getopt::Std; | ||
| 23 | |||
| 24 | # Package and version. | ||
| 25 | $package = 'openjade'; | ||
| 26 | @@ -18,8 +19,7 @@ $gen_c = 0; | ||
| 27 | undef $opt_l; | ||
| 28 | undef $opt_p; | ||
| 29 | undef $opt_t; | ||
| 30 | -do 'getopts.pl'; | ||
| 31 | -&Getopts('l:p:t:'); | ||
| 32 | +getopts('l:p:t:'); | ||
| 33 | $module = $opt_l; | ||
| 34 | $pot_file = $opt_p; | ||
| 35 | |||
| 36 | @@ -72,7 +72,7 @@ while (<DEF>) { | ||
| 37 | else { | ||
| 38 | $field[0] =~ /^[IWQXE][0-9]$/ || &error("invalid first field");; | ||
| 39 | $type[$num] = substr($field[0], 0, 1); | ||
| 40 | - $argc = int(substr($field[0], 1, 1)); | ||
| 41 | + $argc = substr($field[0], 1, 1); | ||
| 42 | } | ||
| 43 | $nargs[$num] = $argc; | ||
| 44 | $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 5b29c1fda0..a539c353a0 100644 --- a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb +++ b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb | |||
| @@ -7,13 +7,14 @@ SECTION = "base" | |||
| 7 | LICENSE = "BSD" | 7 | LICENSE = "BSD" | 
| 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=641ff1e4511f0a87044ad42f87cb1045" | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=641ff1e4511f0a87044ad42f87cb1045" | 
| 9 | 9 | ||
| 10 | PR = "r4" | 10 | PR = "r5" | 
| 11 | 11 | ||
| 12 | DEPENDS = "opensp-native sgml-common-native" | 12 | DEPENDS = "opensp-native sgml-common-native" | 
| 13 | RDEPENDS_${PN} = "sgml-common-native" | 13 | RDEPENDS_${PN} = "sgml-common-native" | 
| 14 | 14 | ||
| 15 | SRC_URI = "${SOURCEFORGE_MIRROR}/openjade/openjade-${PV}.tar.gz \ | 15 | SRC_URI = "${SOURCEFORGE_MIRROR}/openjade/openjade-${PV}.tar.gz \ | 
| 16 | file://makefile.patch \ | 16 | file://makefile.patch \ | 
| 17 | file://msggen.pl.patch \ | ||
| 17 | file://reautoconf.patch \ | 18 | file://reautoconf.patch \ | 
| 18 | file://user-declared-default-constructor.patch" | 19 | file://user-declared-default-constructor.patch" | 
| 19 | 20 | ||
