summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-12 13:05:09 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-12 16:34:30 +0100
commit5ed855d12cddf2de535c3f6d05d3dfe85d69d99d (patch)
tree827245ba5e811e182dc2d19cad7941edb4c2e4e6
parent7e62e24b6cfd1683cd4b7ba565537b25d1b604f8 (diff)
downloadpoky-5ed855d12cddf2de535c3f6d05d3dfe85d69d99d.tar.gz
openjade-native: Ensure we reautoconf the package
Currently since configure.in in is in a subdirectory, we don't reautoconf the recipe. We really need to do this, to update things like the libtool script used and fix various issues such as those that could creep in if a reautoconf is triggered for some reason. Since this source only calls AM_INIT_AUTOMAKE to gain the PACKAGE and VERSION definitions and that macro now errors if Makefile.am doesn't exist, we need to add these definitions manually. These changes avoid failures like: ---- | ... | DssslApp.cxx:117:36: error: 'PACKAGE' was not declared in this scope | DssslApp.cxx:118:36: error: 'VERSION' was not declared in this scope | make[2]: *** [DssslApp.lo] Error 1 ---- (From OE-Core rev: 6f0d830ed047f700702645d454054dfd6fea6f25) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/openjade/openjade-1.3.2/reautoconf.patch83
-rw-r--r--meta/recipes-devtools/openjade/openjade-native_1.3.2.bb5
2 files changed, 88 insertions, 0 deletions
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 @@
1Ensure we reautoconf the packag
2
3Currently since configure.in in is in a subdirectory, we don't reautoconf the
4recipe. We really need to do this, to update things like the libtool script used
5and fix various issues such as those that could creep in if a reautoconf is
6triggered for some reason. Since this source only calls AM_INIT_AUTOMAKE to
7gain the PACKAGE and VERSION definitions and that macro now errors if Makefile.am
8doesn't exist, we need to add these definitions manually.
9
10These 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
17Upstream-Status: Pending
18
19RP 2012/6/12
20
21Index: 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+
65Index: 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-native_1.3.2.bb b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
index 18d311e9d5..5b29c1fda0 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"
14 14
15SRC_URI = "${SOURCEFORGE_MIRROR}/openjade/openjade-${PV}.tar.gz \ 15SRC_URI = "${SOURCEFORGE_MIRROR}/openjade/openjade-${PV}.tar.gz \
16 file://makefile.patch \ 16 file://makefile.patch \
17 file://reautoconf.patch \
17 file://user-declared-default-constructor.patch" 18 file://user-declared-default-constructor.patch"
18 19
19SRC_URI[md5sum] = "7df692e3186109cc00db6825b777201e" 20SRC_URI[md5sum] = "7df692e3186109cc00db6825b777201e"
@@ -38,6 +39,10 @@ CFLAGS =+ "-I${S}/include"
38SSTATEPOSTINSTFUNCS += "openjade_sstate_postinst" 39SSTATEPOSTINSTFUNCS += "openjade_sstate_postinst"
39SYSROOT_PREPROCESS_FUNCS += "openjade_sysroot_preprocess" 40SYSROOT_PREPROCESS_FUNCS += "openjade_sysroot_preprocess"
40 41
42# configure.in needs to be reloacted to trigger reautoconf
43do_configure_prepend () {
44 cp ${S}/config/configure.in ${S}/
45}
41 46
42# We need to do this else the source interdependencies aren't generated and 47# We need to do this else the source interdependencies aren't generated and
43# build failures can result (e.g. zero size style/Makefile.dep file) 48# build failures can result (e.g. zero size style/Makefile.dep file)