mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 12:49:46 +00:00
Code Issues Projects Releases Wiki Activity

openjade: fix build issues

Browse Source 
* 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>
This commit is contained in:
Scott Garman
2011-02-09 16:00:08 -08:00
committed by Richard Purdie
parent 293b023361
commit e56f63a284
5 changed files with 8 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-devtools/openjade/openjade-1.3.2/autoconf.patch
-173
View File
@@ -1,173 +0,0 @@
Patch obtained from OpenEmbedded.
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-- config/acinclude.m4
+++ config/acinclude.m4 2002/04/08 23:13:37
@@ -0,0 +1,61 @@
+dnl Configure-time switch with default
+dnl
+dnl Each switch defines an --enable-FOO and --disable-FOO option in
+dnl the resulting configure script.
+dnl
+dnl Usage:
+dnl SMR_SWITCH(name, description, default, pos-def, neg-def)
+dnl
+dnl where:
+dnl
+dnl name name of switch; generates --enable-name & --disable-name
+dnl options
+dnl description help string is set to this prefixed by "enable" or
+dnl "disable", whichever is the non-default value
+dnl default either "on" or "off"; specifies default if neither
+dnl --enable-name nor --disable-name is specified
+dnl pos-def a symbol to AC_DEFINE if switch is on (optional)
+dnl neg-def a symbol to AC_DEFINE if switch is off (optional)
+dnl
+AC_DEFUN(SMR_SWITCH, [
+ AC_MSG_CHECKING(whether to enable $2)
+ AC_ARG_ENABLE(
+ $1,
+ ifelse($3, on,
+ [ --disable-[$1] disable [$2]],
+ [ --enable-[$1] enable [$2]]),
+ [ if test "$enableval" = yes; then
+ AC_MSG_RESULT(yes)
+ ifelse($4, , , AC_DEFINE($4))
+ else
+ AC_MSG_RESULT(no)
+ ifelse($5, , , AC_DEFINE($5))
+ fi ],
+ ifelse($3, on,
+ [ AC_MSG_RESULT(yes)
+ ifelse($4, , , AC_DEFINE($4)) ],
+ [ AC_MSG_RESULT(no)
+ ifelse($5, , , AC_DEFINE($5))]))])
+
+dnl
+dnl Examine size_t and define SIZE_T_IS_UINT, if size_t is an unsigned int
+dnl
+AC_DEFUN(OJ_SIZE_T_IS_UINT,[
+ AC_REQUIRE([AC_TYPE_SIZE_T])
+ AC_MSG_CHECKING(whether size_t is unsigned int)
+ ac_cv_size_t_is_uint=no
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+ AC_TRY_COMPILE([#include <unistd.h>
+
+ template<class T> class foo { };
+
+ ], [
+ foo<size_t> x;
+ foo<unsigned int> y;
+ x = y;
+ ],ac_cv_size_t_is_uint=yes)
+ AC_LANG_RESTORE
+ AC_MSG_RESULT($ac_cv_size_t_is_uint)
+ test "$ac_cv_size_t_is_uint" = "yes" && AC_DEFINE(SIZE_T_IS_UINT)
+])
Index: openjade-1.3.2/config/acinclude.m4
===================================================================
--- openjade-1.3.2.orig/config/acinclude.m4
+++ openjade-1.3.2/config/acinclude.m4
@@ -1,3 +1,64 @@
+dnl Configure-time switch with default
+dnl
+dnl Each switch defines an --enable-FOO and --disable-FOO option in
+dnl the resulting configure script.
+dnl
+dnl Usage:
+dnl SMR_SWITCH(name, description, default, pos-def, neg-def)
+dnl
+dnl where:
+dnl
+dnl name name of switch; generates --enable-name & --disable-name
+dnl options
+dnl description help string is set to this prefixed by "enable" or
+dnl "disable", whichever is the non-default value
+dnl default either "on" or "off"; specifies default if neither
+dnl --enable-name nor --disable-name is specified
+dnl pos-def a symbol to AC_DEFINE if switch is on (optional)
+dnl neg-def a symbol to AC_DEFINE if switch is off (optional)
+dnl
+AC_DEFUN(SMR_SWITCH, [
+ AC_MSG_CHECKING(whether to enable $2)
+ AC_ARG_ENABLE(
+ $1,
+ ifelse($3, on,
+ [ --disable-[$1] disable [$2]],
+ [ --enable-[$1] enable [$2]]),
+ [ if test "$enableval" = yes; then
+ AC_MSG_RESULT(yes)
+ ifelse($4, , , AC_DEFINE($4))
+ else
+ AC_MSG_RESULT(no)
+ ifelse($5, , , AC_DEFINE($5))
+ fi ],
+ ifelse($3, on,
+ [ AC_MSG_RESULT(yes)
+ ifelse($4, , , AC_DEFINE($4)) ],
+ [ AC_MSG_RESULT(no)
+ ifelse($5, , , AC_DEFINE($5))]))])
+
+dnl
+dnl Examine size_t and define SIZE_T_IS_UINT, if size_t is an unsigned int
+dnl
+AC_DEFUN(OJ_SIZE_T_IS_UINT,[
+ AC_REQUIRE([AC_TYPE_SIZE_T])
+ AC_MSG_CHECKING(whether size_t is unsigned int)
+ ac_cv_size_t_is_uint=no
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+ AC_TRY_COMPILE([#include <unistd.h>
+
+ template<class T> class foo { };
+
+ ], [
+ foo<size_t> x;
+ foo<unsigned int> y;
+ x = y;
+ ],ac_cv_size_t_is_uint=yes)
+ AC_LANG_RESTORE
+ AC_MSG_RESULT($ac_cv_size_t_is_uint)
+ test "$ac_cv_size_t_is_uint" = "yes" && AC_DEFINE(SIZE_T_IS_UINT)
+])
dnl
dnl Examine size_t and define SIZE_T_IS_UINT, if size_t is an unsigned int
dnl
Index: openjade-1.3.2/config/aclocal.m4
===================================================================
--- openjade-1.3.2.orig/config/aclocal.m4
+++ openjade-1.3.2/config/aclocal.m4
@@ -3352,7 +3352,7 @@ dnl Each switch defines an --enable-FOO
dnl the resulting configure script.
dnl
dnl Usage:
-dnl smr_SWITCH(name, description, default, pos-def, neg-def)
+dnl SMR_SWITCH(name, description, default, pos-def, neg-def)
dnl
dnl where:
dnl
@@ -3365,7 +3365,7 @@ dnl --enable-name nor --disa
dnl pos-def a symbol to AC_DEFINE if switch is on (optional)
dnl neg-def a symbol to AC_DEFINE if switch is off (optional)
dnl
-AC_DEFUN(smr_SWITCH, [
+AC_DEFUN(SMR_SWITCH, [
AC_MSG_CHECKING(whether to enable $2)
AC_ARG_ENABLE(
$1,
Index: openjade-1.3.2/config/configure.in
===================================================================
--- openjade-1.3.2.orig/config/configure.in
+++ openjade-1.3.2/config/configure.in
@@ -243,8 +243,8 @@ AC_ARG_ENABLE(http,
dnl
dnl optional backends
dnl
-smr_SWITCH(mif, support for FrameMaker MIF output, on, JADE_MIF, DUMMY)
-smr_SWITCH(html, support for HTML+CSS output, on, JADE_HTML, DUMMY)
+SMR_SWITCH(mif, support for FrameMaker MIF output, on, JADE_MIF, DUMMY)
+SMR_SWITCH(html, support for HTML+CSS output, on, JADE_HTML, DUMMY)
dnl
meta/recipes-devtools/openjade/openjade-1.3.2/configure.patch
-68
View File
@@ -1,68 +0,0 @@
Patch obtained from OpenEmbedded.
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
--- /dev/null 2003-09-23 18:19:32.000000000 -0400
+++ openjade-1.3.2/config/acinclude.m4 2004-01-20 14:39:20.000000000 -0500
@@ -0,0 +1,62 @@
+dnl
+dnl Examine size_t and define SIZE_T_IS_UINT, if size_t is an unsigned int
+dnl
+AC_DEFUN(OJ_SIZE_T_IS_UINT,[
+ AC_REQUIRE([AC_TYPE_SIZE_T])
+ AC_MSG_CHECKING(whether size_t is unsigned int)
+ ac_cv_size_t_is_uint=no
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+ AC_TRY_COMPILE([#include <unistd.h>
+
+ template<class T> class foo { };
+
+ ], [
+ foo<size_t> x;
+ foo<unsigned int> y;
+ x = y;
+ ],ac_cv_size_t_is_uint=yes)
+ AC_LANG_RESTORE
+ AC_MSG_RESULT($ac_cv_size_t_is_uint)
+ test "$ac_cv_size_t_is_uint" = "yes" && AC_DEFINE(SIZE_T_IS_UINT)
+])
+
+dnl Configure-time switch with default
+dnl
+dnl Each switch defines an --enable-FOO and --disable-FOO option in
+dnl the resulting configure script.
+dnl
+dnl Usage:
+dnl smr_SWITCH(name, description, default, pos-def, neg-def)
+dnl
+dnl where:
+dnl
+dnl name name of switch; generates --enable-name & --disable-name
+dnl options
+dnl description help string is set to this prefixed by "enable" or
+dnl "disable", whichever is the non-default value
+dnl default either "on" or "off"; specifies default if neither
+dnl --enable-name nor --disable-name is specified
+dnl pos-def a symbol to AC_DEFINE if switch is on (optional)
+dnl neg-def a symbol to AC_DEFINE if switch is off (optional)
+dnl
+AC_DEFUN(smr_SWITCH, [
+ AC_MSG_CHECKING(whether to enable $2)
+ AC_ARG_ENABLE(
+ $1,
+ ifelse($3, on,
+ [ --disable-[$1] disable [$2]],
+ [ --enable-[$1] enable [$2]]),
+ [ if test "$enableval" = yes; then
+ AC_MSG_RESULT(yes)
+ ifelse($4, , , AC_DEFINE($4))
+ else
+ AC_MSG_RESULT(no)
+ ifelse($5, , , AC_DEFINE($5))
+ fi ],
+ ifelse($3, on,
+ [ AC_MSG_RESULT(yes)
+ ifelse($4, , , AC_DEFINE($4)) ],
+ [ AC_MSG_RESULT(no)
+ ifelse($5, , , AC_DEFINE($5))]))])
+
meta/recipes-devtools/openjade/openjade-1.3.2/makefile.patch
+2 -1
View File
@@ -1,4 +1,5 @@
Patch obtained from OpenEmbedded. This patch fixes libtool QA issues with WORKDIR creeping in to
libospgrove.la and libostyle.la. Patch obtained from OpenEmbedded.
Signed-off-by: Scott Garman <scott.a.garman@intel.com> Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Index: openjade-1.3.2/spgrove/Makefile.sub Index: openjade-1.3.2/spgrove/Makefile.sub
meta/recipes-devtools/openjade/openjade-1.3.2/oj-native-libosp-fix.patch
-15
View File
@@ -1,15 +0,0 @@
Patch obtained from OpenEmbedded.
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Index: openjade-1.3.2/Makefile.prog.in
===================================================================
--- openjade-1.3.2.orig/Makefile.prog.in 2007-12-21 14:48:00.000000000 +0100
+++ openjade-1.3.2/Makefile.prog.in 2007-12-21 14:50:12.000000000 +0100
@@ -13,6 +13,7 @@
ALL_LIBS = $(XLIBS) $(LIBS)
Makefile.lt:
echo 'LT_LIBS='`echo $(ALL_LIBS)|sed 's/\.a/.la/g'` >Makefile.lt
+ sed -i -e "s|libosp.la|libosp.so|" Makefile.lt
PROG:=$(shell echo "$(PROG)" | sed '@program_transform_name@')
meta/recipes-devtools/openjade/openjade_1.3.2.bb → meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
+6 -20
View File
@@ -9,38 +9,26 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=641ff1e4511f0a87044ad42f87cb1045"
PR = "r0" PR = "r0"
DEPENDS = "opensp" DEPENDS = "opensp-native sgml-common-native"
RDEPENDS_${PN} = "sgml-common" RDEPENDS_${PN} = "sgml-common"
SRC_URI = "${SOURCEFORGE_MIRROR}/openjade/openjade-${PV}.tar.gz \ SRC_URI = "${SOURCEFORGE_MIRROR}/openjade/openjade-${PV}.tar.gz \
file://configure.patch \ file://makefile.patch"
file://autoconf.patch \
file://makefile.patch \
"
SRC_URI[md5sum] = "7df692e3186109cc00db6825b777201e" SRC_URI[md5sum] = "7df692e3186109cc00db6825b777201e"
SRC_URI[sha256sum] = "1d2d7996cc94f9b87d0c51cf0e028070ac177c4123ecbfd7ac1cb8d0b7d322d1" SRC_URI[sha256sum] = "1d2d7996cc94f9b87d0c51cf0e028070ac177c4123ecbfd7ac1cb8d0b7d322d1"
SRC_URI_append_virtclass-native = " file://oj-native-libosp-fix.patch" inherit autotools native
inherit autotools
EXTRA_OECONF = "--enable-spincludedir=${STAGING_INCDIR}/OpenSP \ EXTRA_OECONF = "--enable-spincludedir=${STAGING_INCDIR}/OpenSP \
--enable-splibdir=${STAGING_LIBDIR}" --enable-splibdir=${STAGING_LIBDIR}"
acpaths = "-I ${S}/config" CFLAGS =+ "-I${S}/include"
# Trailing whitespace is important. Otherwise compiler arguments will be messed do_install() {
# up, resulting in a fail in do_configure.
CFLAGS_prepend = "-I${S}/include "
do_configure_append () {
cp config/configure.in .
}
do_install_append () {
# Refer to http://www.linuxfromscratch.org/blfs/view/stable/pst/openjade.html # Refer to http://www.linuxfromscratch.org/blfs/view/stable/pst/openjade.html
# for details. # for details.
install -d ${D}${bindir}
install -m 0755 ${S}/jade/.libs/openjade ${D}${bindir}/openjade install -m 0755 ${S}/jade/.libs/openjade ${D}${bindir}/openjade
ln -sf openjade ${D}${bindir}/jade ln -sf openjade ${D}${bindir}/jade
@@ -62,5 +50,3 @@ do_install_append () {
install-catalog --add ${sysconfdir}/sgml/sgml-docbook.cat \ install-catalog --add ${sysconfdir}/sgml/sgml-docbook.cat \
${sysconfdir}/sgml/openjade-${PV}.cat ${sysconfdir}/sgml/openjade-${PV}.cat
} }
BBCLASSEXTEND = "native"