summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2011-02-09 16:00:08 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-12 00:30:28 +0000
commite56f63a2843e5a7d70fd60e0aaed4d962a277da7 (patch)
tree1b1d1bd2cab1a531e5f5d3a476fd75be7e7d6a7e /meta
parent293b023361580cdf41cf8aa0d8e96fd9c380e424 (diff)
downloadpoky-e56f63a2843e5a7d70fd60e0aaed4d962a277da7.tar.gz
openjade: fix build issues
* Recipe is now -native only * Fix install failure due to missing install path * Removed recipe cruft that was not needed, simplifying it * Removed unnecessary patches * Improved patch comment for makefile.patch Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/openjade/openjade-1.3.2/autoconf.patch173
-rw-r--r--meta/recipes-devtools/openjade/openjade-1.3.2/configure.patch68
-rw-r--r--meta/recipes-devtools/openjade/openjade-1.3.2/makefile.patch3
-rw-r--r--meta/recipes-devtools/openjade/openjade-1.3.2/oj-native-libosp-fix.patch15
-rw-r--r--meta/recipes-devtools/openjade/openjade-native_1.3.2.bb (renamed from meta/recipes-devtools/openjade/openjade_1.3.2.bb)26
5 files changed, 8 insertions, 277 deletions
diff --git a/meta/recipes-devtools/openjade/openjade-1.3.2/autoconf.patch b/meta/recipes-devtools/openjade/openjade-1.3.2/autoconf.patch
deleted file mode 100644
index fe8df5bb4a..0000000000
--- a/meta/recipes-devtools/openjade/openjade-1.3.2/autoconf.patch
+++ /dev/null
@@ -1,173 +0,0 @@
1Patch obtained from OpenEmbedded.
2
3Signed-off-by: Scott Garman <scott.a.garman@intel.com>
4-- config/acinclude.m4
5+++ config/acinclude.m4 2002/04/08 23:13:37
6@@ -0,0 +1,61 @@
7+dnl Configure-time switch with default
8+dnl
9+dnl Each switch defines an --enable-FOO and --disable-FOO option in
10+dnl the resulting configure script.
11+dnl
12+dnl Usage:
13+dnl SMR_SWITCH(name, description, default, pos-def, neg-def)
14+dnl
15+dnl where:
16+dnl
17+dnl name name of switch; generates --enable-name & --disable-name
18+dnl options
19+dnl description help string is set to this prefixed by "enable" or
20+dnl "disable", whichever is the non-default value
21+dnl default either "on" or "off"; specifies default if neither
22+dnl --enable-name nor --disable-name is specified
23+dnl pos-def a symbol to AC_DEFINE if switch is on (optional)
24+dnl neg-def a symbol to AC_DEFINE if switch is off (optional)
25+dnl
26+AC_DEFUN(SMR_SWITCH, [
27+ AC_MSG_CHECKING(whether to enable $2)
28+ AC_ARG_ENABLE(
29+ $1,
30+ ifelse($3, on,
31+ [ --disable-[$1] disable [$2]],
32+ [ --enable-[$1] enable [$2]]),
33+ [ if test "$enableval" = yes; then
34+ AC_MSG_RESULT(yes)
35+ ifelse($4, , , AC_DEFINE($4))
36+ else
37+ AC_MSG_RESULT(no)
38+ ifelse($5, , , AC_DEFINE($5))
39+ fi ],
40+ ifelse($3, on,
41+ [ AC_MSG_RESULT(yes)
42+ ifelse($4, , , AC_DEFINE($4)) ],
43+ [ AC_MSG_RESULT(no)
44+ ifelse($5, , , AC_DEFINE($5))]))])
45+
46+dnl
47+dnl Examine size_t and define SIZE_T_IS_UINT, if size_t is an unsigned int
48+dnl
49+AC_DEFUN(OJ_SIZE_T_IS_UINT,[
50+ AC_REQUIRE([AC_TYPE_SIZE_T])
51+ AC_MSG_CHECKING(whether size_t is unsigned int)
52+ ac_cv_size_t_is_uint=no
53+ AC_LANG_SAVE
54+ AC_LANG_CPLUSPLUS
55+ AC_TRY_COMPILE([#include <unistd.h>
56+
57+ template<class T> class foo { };
58+
59+ ], [
60+ foo<size_t> x;
61+ foo<unsigned int> y;
62+ x = y;
63+ ],ac_cv_size_t_is_uint=yes)
64+ AC_LANG_RESTORE
65+ AC_MSG_RESULT($ac_cv_size_t_is_uint)
66+ test "$ac_cv_size_t_is_uint" = "yes" && AC_DEFINE(SIZE_T_IS_UINT)
67+])
68Index: openjade-1.3.2/config/acinclude.m4
69===================================================================
70--- openjade-1.3.2.orig/config/acinclude.m4
71+++ openjade-1.3.2/config/acinclude.m4
72@@ -1,3 +1,64 @@
73+dnl Configure-time switch with default
74+dnl
75+dnl Each switch defines an --enable-FOO and --disable-FOO option in
76+dnl the resulting configure script.
77+dnl
78+dnl Usage:
79+dnl SMR_SWITCH(name, description, default, pos-def, neg-def)
80+dnl
81+dnl where:
82+dnl
83+dnl name name of switch; generates --enable-name & --disable-name
84+dnl options
85+dnl description help string is set to this prefixed by "enable" or
86+dnl "disable", whichever is the non-default value
87+dnl default either "on" or "off"; specifies default if neither
88+dnl --enable-name nor --disable-name is specified
89+dnl pos-def a symbol to AC_DEFINE if switch is on (optional)
90+dnl neg-def a symbol to AC_DEFINE if switch is off (optional)
91+dnl
92+AC_DEFUN(SMR_SWITCH, [
93+ AC_MSG_CHECKING(whether to enable $2)
94+ AC_ARG_ENABLE(
95+ $1,
96+ ifelse($3, on,
97+ [ --disable-[$1] disable [$2]],
98+ [ --enable-[$1] enable [$2]]),
99+ [ if test "$enableval" = yes; then
100+ AC_MSG_RESULT(yes)
101+ ifelse($4, , , AC_DEFINE($4))
102+ else
103+ AC_MSG_RESULT(no)
104+ ifelse($5, , , AC_DEFINE($5))
105+ fi ],
106+ ifelse($3, on,
107+ [ AC_MSG_RESULT(yes)
108+ ifelse($4, , , AC_DEFINE($4)) ],
109+ [ AC_MSG_RESULT(no)
110+ ifelse($5, , , AC_DEFINE($5))]))])
111+
112+dnl
113+dnl Examine size_t and define SIZE_T_IS_UINT, if size_t is an unsigned int
114+dnl
115+AC_DEFUN(OJ_SIZE_T_IS_UINT,[
116+ AC_REQUIRE([AC_TYPE_SIZE_T])
117+ AC_MSG_CHECKING(whether size_t is unsigned int)
118+ ac_cv_size_t_is_uint=no
119+ AC_LANG_SAVE
120+ AC_LANG_CPLUSPLUS
121+ AC_TRY_COMPILE([#include <unistd.h>
122+
123+ template<class T> class foo { };
124+
125+ ], [
126+ foo<size_t> x;
127+ foo<unsigned int> y;
128+ x = y;
129+ ],ac_cv_size_t_is_uint=yes)
130+ AC_LANG_RESTORE
131+ AC_MSG_RESULT($ac_cv_size_t_is_uint)
132+ test "$ac_cv_size_t_is_uint" = "yes" && AC_DEFINE(SIZE_T_IS_UINT)
133+])
134 dnl
135 dnl Examine size_t and define SIZE_T_IS_UINT, if size_t is an unsigned int
136 dnl
137Index: openjade-1.3.2/config/aclocal.m4
138===================================================================
139--- openjade-1.3.2.orig/config/aclocal.m4
140+++ openjade-1.3.2/config/aclocal.m4
141@@ -3352,7 +3352,7 @@ dnl Each switch defines an --enable-FOO
142 dnl the resulting configure script.
143 dnl
144 dnl Usage:
145-dnl smr_SWITCH(name, description, default, pos-def, neg-def)
146+dnl SMR_SWITCH(name, description, default, pos-def, neg-def)
147 dnl
148 dnl where:
149 dnl
150@@ -3365,7 +3365,7 @@ dnl --enable-name nor --disa
151 dnl pos-def a symbol to AC_DEFINE if switch is on (optional)
152 dnl neg-def a symbol to AC_DEFINE if switch is off (optional)
153 dnl
154-AC_DEFUN(smr_SWITCH, [
155+AC_DEFUN(SMR_SWITCH, [
156 AC_MSG_CHECKING(whether to enable $2)
157 AC_ARG_ENABLE(
158 $1,
159Index: openjade-1.3.2/config/configure.in
160===================================================================
161--- openjade-1.3.2.orig/config/configure.in
162+++ openjade-1.3.2/config/configure.in
163@@ -243,8 +243,8 @@ AC_ARG_ENABLE(http,
164 dnl
165 dnl optional backends
166 dnl
167-smr_SWITCH(mif, support for FrameMaker MIF output, on, JADE_MIF, DUMMY)
168-smr_SWITCH(html, support for HTML+CSS output, on, JADE_HTML, DUMMY)
169+SMR_SWITCH(mif, support for FrameMaker MIF output, on, JADE_MIF, DUMMY)
170+SMR_SWITCH(html, support for HTML+CSS output, on, JADE_HTML, DUMMY)
171
172
173 dnl
diff --git a/meta/recipes-devtools/openjade/openjade-1.3.2/configure.patch b/meta/recipes-devtools/openjade/openjade-1.3.2/configure.patch
deleted file mode 100644
index 2dcaa4d9e6..0000000000
--- a/meta/recipes-devtools/openjade/openjade-1.3.2/configure.patch
+++ /dev/null
@@ -1,68 +0,0 @@
1Patch obtained from OpenEmbedded.
2
3Signed-off-by: Scott Garman <scott.a.garman@intel.com>
4--- /dev/null 2003-09-23 18:19:32.000000000 -0400
5+++ openjade-1.3.2/config/acinclude.m4 2004-01-20 14:39:20.000000000 -0500
6@@ -0,0 +1,62 @@
7+dnl
8+dnl Examine size_t and define SIZE_T_IS_UINT, if size_t is an unsigned int
9+dnl
10+AC_DEFUN(OJ_SIZE_T_IS_UINT,[
11+ AC_REQUIRE([AC_TYPE_SIZE_T])
12+ AC_MSG_CHECKING(whether size_t is unsigned int)
13+ ac_cv_size_t_is_uint=no
14+ AC_LANG_SAVE
15+ AC_LANG_CPLUSPLUS
16+ AC_TRY_COMPILE([#include <unistd.h>
17+
18+ template<class T> class foo { };
19+
20+ ], [
21+ foo<size_t> x;
22+ foo<unsigned int> y;
23+ x = y;
24+ ],ac_cv_size_t_is_uint=yes)
25+ AC_LANG_RESTORE
26+ AC_MSG_RESULT($ac_cv_size_t_is_uint)
27+ test "$ac_cv_size_t_is_uint" = "yes" && AC_DEFINE(SIZE_T_IS_UINT)
28+])
29+
30+dnl Configure-time switch with default
31+dnl
32+dnl Each switch defines an --enable-FOO and --disable-FOO option in
33+dnl the resulting configure script.
34+dnl
35+dnl Usage:
36+dnl smr_SWITCH(name, description, default, pos-def, neg-def)
37+dnl
38+dnl where:
39+dnl
40+dnl name name of switch; generates --enable-name & --disable-name
41+dnl options
42+dnl description help string is set to this prefixed by "enable" or
43+dnl "disable", whichever is the non-default value
44+dnl default either "on" or "off"; specifies default if neither
45+dnl --enable-name nor --disable-name is specified
46+dnl pos-def a symbol to AC_DEFINE if switch is on (optional)
47+dnl neg-def a symbol to AC_DEFINE if switch is off (optional)
48+dnl
49+AC_DEFUN(smr_SWITCH, [
50+ AC_MSG_CHECKING(whether to enable $2)
51+ AC_ARG_ENABLE(
52+ $1,
53+ ifelse($3, on,
54+ [ --disable-[$1] disable [$2]],
55+ [ --enable-[$1] enable [$2]]),
56+ [ if test "$enableval" = yes; then
57+ AC_MSG_RESULT(yes)
58+ ifelse($4, , , AC_DEFINE($4))
59+ else
60+ AC_MSG_RESULT(no)
61+ ifelse($5, , , AC_DEFINE($5))
62+ fi ],
63+ ifelse($3, on,
64+ [ AC_MSG_RESULT(yes)
65+ ifelse($4, , , AC_DEFINE($4)) ],
66+ [ AC_MSG_RESULT(no)
67+ ifelse($5, , , AC_DEFINE($5))]))])
68+
diff --git a/meta/recipes-devtools/openjade/openjade-1.3.2/makefile.patch b/meta/recipes-devtools/openjade/openjade-1.3.2/makefile.patch
index ac5c7447f6..84e1d63151 100644
--- a/meta/recipes-devtools/openjade/openjade-1.3.2/makefile.patch
+++ b/meta/recipes-devtools/openjade/openjade-1.3.2/makefile.patch
@@ -1,4 +1,5 @@
1Patch obtained from OpenEmbedded. 1This patch fixes libtool QA issues with WORKDIR creeping in to
2libospgrove.la and libostyle.la. Patch obtained from OpenEmbedded.
2 3
3Signed-off-by: Scott Garman <scott.a.garman@intel.com> 4Signed-off-by: Scott Garman <scott.a.garman@intel.com>
4Index: openjade-1.3.2/spgrove/Makefile.sub 5Index: openjade-1.3.2/spgrove/Makefile.sub
diff --git a/meta/recipes-devtools/openjade/openjade-1.3.2/oj-native-libosp-fix.patch b/meta/recipes-devtools/openjade/openjade-1.3.2/oj-native-libosp-fix.patch
deleted file mode 100644
index 48e38048ba..0000000000
--- a/meta/recipes-devtools/openjade/openjade-1.3.2/oj-native-libosp-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Patch obtained from OpenEmbedded.
2
3Signed-off-by: Scott Garman <scott.a.garman@intel.com>
4Index: openjade-1.3.2/Makefile.prog.in
5===================================================================
6--- openjade-1.3.2.orig/Makefile.prog.in 2007-12-21 14:48:00.000000000 +0100
7+++ openjade-1.3.2/Makefile.prog.in 2007-12-21 14:50:12.000000000 +0100
8@@ -13,6 +13,7 @@
9 ALL_LIBS = $(XLIBS) $(LIBS)
10 Makefile.lt:
11 echo 'LT_LIBS='`echo $(ALL_LIBS)|sed 's/\.a/.la/g'` >Makefile.lt
12+ sed -i -e "s|libosp.la|libosp.so|" Makefile.lt
13
14 PROG:=$(shell echo "$(PROG)" | sed '@program_transform_name@')
15
diff --git a/meta/recipes-devtools/openjade/openjade_1.3.2.bb b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
index f2ad8aef7c..f267fc5483 100644
--- a/meta/recipes-devtools/openjade/openjade_1.3.2.bb
+++ b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
@@ -9,38 +9,26 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=641ff1e4511f0a87044ad42f87cb1045"
9 9
10PR = "r0" 10PR = "r0"
11 11
12DEPENDS = "opensp" 12DEPENDS = "opensp-native sgml-common-native"
13RDEPENDS_${PN} = "sgml-common" 13RDEPENDS_${PN} = "sgml-common"
14 14
15SRC_URI = "${SOURCEFORGE_MIRROR}/openjade/openjade-${PV}.tar.gz \ 15SRC_URI = "${SOURCEFORGE_MIRROR}/openjade/openjade-${PV}.tar.gz \
16 file://configure.patch \ 16 file://makefile.patch"
17 file://autoconf.patch \
18 file://makefile.patch \
19 "
20 17
21SRC_URI[md5sum] = "7df692e3186109cc00db6825b777201e" 18SRC_URI[md5sum] = "7df692e3186109cc00db6825b777201e"
22SRC_URI[sha256sum] = "1d2d7996cc94f9b87d0c51cf0e028070ac177c4123ecbfd7ac1cb8d0b7d322d1" 19SRC_URI[sha256sum] = "1d2d7996cc94f9b87d0c51cf0e028070ac177c4123ecbfd7ac1cb8d0b7d322d1"
23 20
24SRC_URI_append_virtclass-native = " file://oj-native-libosp-fix.patch" 21inherit autotools native
25
26inherit autotools
27 22
28EXTRA_OECONF = "--enable-spincludedir=${STAGING_INCDIR}/OpenSP \ 23EXTRA_OECONF = "--enable-spincludedir=${STAGING_INCDIR}/OpenSP \
29 --enable-splibdir=${STAGING_LIBDIR}" 24 --enable-splibdir=${STAGING_LIBDIR}"
30 25
31acpaths = "-I ${S}/config" 26CFLAGS =+ "-I${S}/include"
32
33# Trailing whitespace is important. Otherwise compiler arguments will be messed
34# up, resulting in a fail in do_configure.
35CFLAGS_prepend = "-I${S}/include "
36 27
37do_configure_append () { 28do_install() {
38 cp config/configure.in .
39}
40
41do_install_append () {
42 # Refer to http://www.linuxfromscratch.org/blfs/view/stable/pst/openjade.html 29 # Refer to http://www.linuxfromscratch.org/blfs/view/stable/pst/openjade.html
43 # for details. 30 # for details.
31 install -d ${D}${bindir}
44 install -m 0755 ${S}/jade/.libs/openjade ${D}${bindir}/openjade 32 install -m 0755 ${S}/jade/.libs/openjade ${D}${bindir}/openjade
45 ln -sf openjade ${D}${bindir}/jade 33 ln -sf openjade ${D}${bindir}/jade
46 34
@@ -62,5 +50,3 @@ do_install_append () {
62 install-catalog --add ${sysconfdir}/sgml/sgml-docbook.cat \ 50 install-catalog --add ${sysconfdir}/sgml/sgml-docbook.cat \
63 ${sysconfdir}/sgml/openjade-${PV}.cat 51 ${sysconfdir}/sgml/openjade-${PV}.cat
64} 52}
65
66BBCLASSEXTEND = "native"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-12 02:18:38 +0000