diff options
author | Adrian Dudau <adrian.dudau@enea.com> | 2014-06-26 14:36:22 +0200 |
---|---|---|
committer | Adrian Dudau <adrian.dudau@enea.com> | 2014-06-26 15:32:53 +0200 |
commit | f4cf9fe05bb3f32fabea4e54dd92d368967a80da (patch) | |
tree | 487180fa9866985ea7b28e625651765d86f515c3 /meta/recipes-devtools/openjade/openjade-1.3.2 | |
download | poky-f4cf9fe05bb3f32fabea4e54dd92d368967a80da.tar.gz |
initial commit for Enea Linux 4.0
Migrated from the internal git server on the daisy-enea branch
Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
Diffstat (limited to 'meta/recipes-devtools/openjade/openjade-1.3.2')
5 files changed, 290 insertions, 0 deletions
diff --git a/meta/recipes-devtools/openjade/openjade-1.3.2/fix-regex.patch b/meta/recipes-devtools/openjade/openjade-1.3.2/fix-regex.patch new file mode 100644 index 0000000000..6b40afdad8 --- /dev/null +++ b/meta/recipes-devtools/openjade/openjade-1.3.2/fix-regex.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From 55f6fd8f1958aa36584eefeecce782a505963c88 Mon Sep 17 00:00:00 2001 | ||
2 | From: benvm <benvm@yow-gmoffatt-lx2.wrs.com> | ||
3 | Date: Wed, 9 Jan 2013 12:14:06 -0500 | ||
4 | Subject: [PATCH] Fix Makefile regular expression | ||
5 | |||
6 | This patch modifies a regular expression within a Makefile to stop builds | ||
7 | from failing in the case where the path contains the characters ".a". | ||
8 | |||
9 | Upstream-Status: Submitted | ||
10 | |||
11 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
12 | |||
13 | --- | ||
14 | Makefile.prog.in | 2 +- | ||
15 | 1 files changed, 1 insertions(+), 1 deletions(-) | ||
16 | |||
17 | diff --git a/Makefile.prog.in b/Makefile.prog.in | ||
18 | index 76310c9..44c3534 100644 | ||
19 | --- a/Makefile.prog.in | ||
20 | +++ b/Makefile.prog.in | ||
21 | @@ -12,7 +12,7 @@ LINKFLAGS = @LINKFLAGS@ | ||
22 | |||
23 | ALL_LIBS = $(XLIBS) $(LIBS) | ||
24 | Makefile.lt: | ||
25 | - echo 'LT_LIBS='`echo $(ALL_LIBS)|sed 's/\.a/.la/g'` >Makefile.lt | ||
26 | + echo 'LT_LIBS='`echo $(ALL_LIBS) | sed 's/\.a\s/\.la /g' | sed s/\.a$$/\.la/` > Makefile.lt | ||
27 | |||
28 | PROG:=$(shell echo "$(PROG)" | sed '@program_transform_name@') | ||
29 | |||
30 | -- | ||
31 | 1.7.0.4 | ||
32 | |||
diff --git a/meta/recipes-devtools/openjade/openjade-1.3.2/makefile.patch b/meta/recipes-devtools/openjade/openjade-1.3.2/makefile.patch new file mode 100644 index 0000000000..968b9b47cf --- /dev/null +++ b/meta/recipes-devtools/openjade/openjade-1.3.2/makefile.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | This patch fixes libtool QA issues with WORKDIR creeping in to | ||
2 | libospgrove.la and libostyle.la. Patch obtained from OpenEmbedded. | ||
3 | |||
4 | Upstream-Status: Inappropriate [Other] | ||
5 | Workaround is specific to our build system. | ||
6 | |||
7 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
8 | |||
9 | Index: openjade-1.3.2/spgrove/Makefile.sub | ||
10 | =================================================================== | ||
11 | --- openjade-1.3.2.orig/spgrove/Makefile.sub | ||
12 | +++ openjade-1.3.2/spgrove/Makefile.sub | ||
13 | @@ -1,8 +1,8 @@ | ||
14 | LTVERSION=0:1:0 | ||
15 | LIB=ospgrove | ||
16 | INCLUDE=-I$(srcdir)/../grove | ||
17 | -DEPLIBS=-lm -L$(TOP)/grove -L$(TOP)/grove/.libs \ | ||
18 | - -L$(TOP)/lib -L$(TOP)/lib/.libs \ | ||
19 | +DEPLIBS=-lm $(TOP)/grove \ | ||
20 | + $(TOP)/lib \ | ||
21 | $(LIB_THREADS) | ||
22 | OBJS=GroveApp.o GroveBuilder.o SdNode.o | ||
23 | GENSRCS=grove_inst.cxx | ||
24 | Index: openjade-1.3.2/style/Makefile.sub | ||
25 | =================================================================== | ||
26 | --- openjade-1.3.2.orig/style/Makefile.sub | ||
27 | +++ openjade-1.3.2/style/Makefile.sub | ||
28 | @@ -1,8 +1,8 @@ | ||
29 | LTVERSION=0:1:0 | ||
30 | LIB=ostyle | ||
31 | -DEPLIBS=-lm -L$(TOP)/grove -L$(TOP)/grove/.libs \ | ||
32 | - -L$(TOP)/lib -L$(TOP)/lib/.libs \ | ||
33 | - -L$(TOP)/spgrove -L$(TOP)/spgrove/.libs | ||
34 | +DEPLIBS=-lm $(TOP)/grove \ | ||
35 | + $(TOP)/lib \ | ||
36 | + $(TOP)/spgrove | ||
37 | OBJS=LangObj.o \ | ||
38 | Collector.o \ | ||
39 | DssslApp.o \ | ||
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-1.3.2/reautoconf.patch b/meta/recipes-devtools/openjade/openjade-1.3.2/reautoconf.patch new file mode 100644 index 0000000000..1a23a4a685 --- /dev/null +++ b/meta/recipes-devtools/openjade/openjade-1.3.2/reautoconf.patch | |||
@@ -0,0 +1,83 @@ | |||
1 | Ensure we reautoconf the packag | ||
2 | |||
3 | Currently since configure.in in is in a subdirectory, we don't reautoconf the | ||
4 | recipe. We really need to do this, to update things like the libtool script used | ||
5 | and fix various issues such as those that could creep in if a reautoconf is | ||
6 | triggered for some reason. Since this source only calls AM_INIT_AUTOMAKE to | ||
7 | gain the PACKAGE and VERSION definitions and that macro now errors if Makefile.am | ||
8 | doesn't exist, we need to add these definitions manually. | ||
9 | |||
10 | These changes avoid failures like: | ||
11 | ---- | ||
12 | | ... | ||
13 | | DssslApp.cxx:117:36: error: 'PACKAGE' was not declared in this scope | ||
14 | | DssslApp.cxx:118:36: error: 'VERSION' was not declared in this scope | ||
15 | | make[2]: *** [DssslApp.lo] Error 1 ---- | ||
16 | |||
17 | Upstream-Status: Pending | ||
18 | |||
19 | RP 2012/6/12 | ||
20 | |||
21 | Index: openjade-1.3.2/acinclude.m4 | ||
22 | =================================================================== | ||
23 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | ||
24 | +++ openjade-1.3.2/acinclude.m4 2012-06-12 12:48:54.871365344 +0000 | ||
25 | @@ -0,0 +1,39 @@ | ||
26 | +dnl Configure-time switch with default | ||
27 | +dnl | ||
28 | +dnl Each switch defines an --enable-FOO and --disable-FOO option in | ||
29 | +dnl the resulting configure script. | ||
30 | +dnl | ||
31 | +dnl Usage: | ||
32 | +dnl smr_SWITCH(name, description, default, pos-def, neg-def) | ||
33 | +dnl | ||
34 | +dnl where: | ||
35 | +dnl | ||
36 | +dnl name name of switch; generates --enable-name & --disable-name | ||
37 | +dnl options | ||
38 | +dnl description help string is set to this prefixed by "enable" or | ||
39 | +dnl "disable", whichever is the non-default value | ||
40 | +dnl default either "on" or "off"; specifies default if neither | ||
41 | +dnl --enable-name nor --disable-name is specified | ||
42 | +dnl pos-def a symbol to AC_DEFINE if switch is on (optional) | ||
43 | +dnl neg-def a symbol to AC_DEFINE if switch is off (optional) | ||
44 | +dnl | ||
45 | +AC_DEFUN(smr_SWITCH, [ | ||
46 | + AC_MSG_CHECKING(whether to enable $2) | ||
47 | + AC_ARG_ENABLE( | ||
48 | + $1, | ||
49 | + ifelse($3, on, | ||
50 | + [ --disable-[$1] disable [$2]], | ||
51 | + [ --enable-[$1] enable [$2]]), | ||
52 | + [ if test "$enableval" = yes; then | ||
53 | + AC_MSG_RESULT(yes) | ||
54 | + ifelse($4, , , AC_DEFINE($4)) | ||
55 | + else | ||
56 | + AC_MSG_RESULT(no) | ||
57 | + ifelse($5, , , AC_DEFINE($5)) | ||
58 | + fi ], | ||
59 | + ifelse($3, on, | ||
60 | + [ AC_MSG_RESULT(yes) | ||
61 | + ifelse($4, , , AC_DEFINE($4)) ], | ||
62 | + [ AC_MSG_RESULT(no) | ||
63 | + ifelse($5, , , AC_DEFINE($5))]))]) | ||
64 | + | ||
65 | Index: openjade-1.3.2/config/configure.in | ||
66 | =================================================================== | ||
67 | --- openjade-1.3.2.orig/config/configure.in 2012-06-12 12:47:20.735365445 +0000 | ||
68 | +++ openjade-1.3.2/config/configure.in 2012-06-12 12:48:17.507364080 +0000 | ||
69 | @@ -12,9 +12,12 @@ | ||
70 | dnl Credits: this autoconf script was largely "inspired" <g> by the | ||
71 | dnl autoconf script around SP made by Henry Thompson. | ||
72 | dnl | ||
73 | -AC_INIT(dsssl) | ||
74 | +AC_INIT([openjade], [1.3.2]) | ||
75 | AC_CONFIG_AUX_DIR(config) | ||
76 | -AM_INIT_AUTOMAKE( openjade, 1.3.2) | ||
77 | +AC_SUBST([PACKAGE], [openjade]) | ||
78 | +AC_SUBST([VERSION], [1.3.2]) | ||
79 | +AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") | ||
80 | +AC_DEFINE_UNQUOTED(VERSION, "$VERSION") | ||
81 | TOP=`pwd` | ||
82 | AC_SUBST(TOP) | ||
83 | dnl | ||
diff --git a/meta/recipes-devtools/openjade/openjade-1.3.2/user-declared-default-constructor.patch b/meta/recipes-devtools/openjade/openjade-1.3.2/user-declared-default-constructor.patch new file mode 100644 index 0000000000..073af46fc5 --- /dev/null +++ b/meta/recipes-devtools/openjade/openjade-1.3.2/user-declared-default-constructor.patch | |||
@@ -0,0 +1,92 @@ | |||
1 | In GCC 4.6 the compiler no longer allows objects of const-qualified type to | ||
2 | be default initialized unless the type has a user-declared default | ||
3 | constructor. | ||
4 | |||
5 | Patch from Gentoo bugzilla: http://bugs.gentoo.org/show_bug.cgi?id=358021 | ||
6 | |||
7 | Gentoo Bugzilla description follows: | ||
8 | "If a class or struct has no user-defined default constructor, C++ doesn't | ||
9 | allow you to default construct a const instance of it. | ||
10 | |||
11 | https://bugs.gentoo.org/358021 | ||
12 | http://clang.llvm.org/compatibility.html#default_init_const | ||
13 | http://gcc.gnu.org/PR44499" | ||
14 | |||
15 | Upstream-Status: Pending | ||
16 | |||
17 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
18 | |||
19 | --- a/jade/TeXFOTBuilder.cxx | ||
20 | +++ b/jade/TeXFOTBuilder.cxx | ||
21 | @@ -88,6 +88,8 @@ public: | ||
22 | value.convertString(nic_.placement); | ||
23 | } | ||
24 | ExtensionFlowObj *copy() const { return new PageFloatFlowObj(*this); } | ||
25 | + public: | ||
26 | + PageFloatFlowObj() {} | ||
27 | private: | ||
28 | PageFloatNIC nic_; | ||
29 | StringC name_; | ||
30 | @@ -101,6 +103,8 @@ public: | ||
31 | fotb.endPageFootnote(); | ||
32 | } | ||
33 | ExtensionFlowObj *copy() const { return new PageFootnoteFlowObj(*this); } | ||
34 | + public: | ||
35 | + PageFootnoteFlowObj() {} | ||
36 | private: | ||
37 | }; | ||
38 | ////////////////////////////////////////////////////////////////////// | ||
39 | --- a/jade/TransformFOTBuilder.cxx | ||
40 | +++ b/jade/TransformFOTBuilder.cxx | ||
41 | @@ -41,6 +41,7 @@ public: | ||
42 | }; | ||
43 | class EntityRefFlowObj : public TransformExtensionFlowObj { | ||
44 | public: | ||
45 | + EntityRefFlowObj() {} | ||
46 | void atomic(TransformFOTBuilder &fotb, const NodePtr &) const { | ||
47 | fotb.entityRef(name_); | ||
48 | } | ||
49 | @@ -56,6 +57,7 @@ public: | ||
50 | }; | ||
51 | class ProcessingInstructionFlowObj : public TransformExtensionFlowObj { | ||
52 | public: | ||
53 | + ProcessingInstructionFlowObj() {} | ||
54 | void atomic(TransformFOTBuilder &fotb, const NodePtr &) const { | ||
55 | fotb.processingInstruction(data_); | ||
56 | } | ||
57 | @@ -98,6 +100,8 @@ public: | ||
58 | } | ||
59 | } | ||
60 | ExtensionFlowObj *copy() const { return new EmptyElementFlowObj(*this); } | ||
61 | + public: | ||
62 | + EmptyElementFlowObj() {} | ||
63 | private: | ||
64 | ElementNIC nic_; | ||
65 | }; | ||
66 | @@ -133,6 +137,8 @@ public: | ||
67 | } | ||
68 | } | ||
69 | ExtensionFlowObj *copy() const { return new ElementFlowObj(*this); } | ||
70 | + public: | ||
71 | + ElementFlowObj() {} | ||
72 | private: | ||
73 | ElementNIC nic_; | ||
74 | }; | ||
75 | @@ -150,6 +156,8 @@ public: | ||
76 | value.convertString(systemId_); | ||
77 | } | ||
78 | ExtensionFlowObj *copy() const { return new EntityFlowObj(*this); } | ||
79 | + public: | ||
80 | + EntityFlowObj() {} | ||
81 | private: | ||
82 | StringC systemId_; | ||
83 | }; | ||
84 | @@ -174,6 +182,8 @@ public: | ||
85 | } | ||
86 | } | ||
87 | ExtensionFlowObj *copy() const { return new DocumentTypeFlowObj(*this); } | ||
88 | + public: | ||
89 | + DocumentTypeFlowObj() {} | ||
90 | private: | ||
91 | DocumentTypeNIC nic_; | ||
92 | }; | ||