From 3c7183135d47878f1074b5d9f1ad7570682d44ee Mon Sep 17 00:00:00 2001 From: Scott Garman Date: Wed, 26 Jan 2011 13:35:37 -0800 Subject: openjade: new recipe v1.3.2 Recipe derived from OpenEmbedded. Signed-off-by: Scott Garman --- .../openjade/openjade-1.3.2/autoconf.patch | 173 +++++++++++++++++++++ .../openjade/openjade-1.3.2/configure.patch | 68 ++++++++ .../openjade/openjade-1.3.2/makefile.patch | 34 ++++ .../openjade-1.3.2/oj-native-libosp-fix.patch | 15 ++ 4 files changed, 290 insertions(+) create mode 100644 meta/recipes-devtools/openjade/openjade-1.3.2/autoconf.patch create mode 100644 meta/recipes-devtools/openjade/openjade-1.3.2/configure.patch create mode 100644 meta/recipes-devtools/openjade/openjade-1.3.2/makefile.patch create mode 100644 meta/recipes-devtools/openjade/openjade-1.3.2/oj-native-libosp-fix.patch (limited to 'meta/recipes-devtools/openjade/openjade-1.3.2') diff --git a/meta/recipes-devtools/openjade/openjade-1.3.2/autoconf.patch b/meta/recipes-devtools/openjade/openjade-1.3.2/autoconf.patch new file mode 100644 index 0000000000..fe8df5bb4a --- /dev/null +++ b/meta/recipes-devtools/openjade/openjade-1.3.2/autoconf.patch @@ -0,0 +1,173 @@ +Patch obtained from OpenEmbedded. + +Signed-off-by: Scott Garman +-- 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 ++ ++ template class foo { }; ++ ++ ], [ ++ foo x; ++ foo 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 ++ ++ template class foo { }; ++ ++ ], [ ++ foo x; ++ foo 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 diff --git a/meta/recipes-devtools/openjade/openjade-1.3.2/configure.patch b/meta/recipes-devtools/openjade/openjade-1.3.2/configure.patch new file mode 100644 index 0000000000..2dcaa4d9e6 --- /dev/null +++ b/meta/recipes-devtools/openjade/openjade-1.3.2/configure.patch @@ -0,0 +1,68 @@ +Patch obtained from OpenEmbedded. + +Signed-off-by: Scott Garman +--- /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 ++ ++ template class foo { }; ++ ++ ], [ ++ foo x; ++ foo 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))]))]) ++ 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..ac5c7447f6 --- /dev/null +++ b/meta/recipes-devtools/openjade/openjade-1.3.2/makefile.patch @@ -0,0 +1,34 @@ +Patch obtained from OpenEmbedded. + +Signed-off-by: Scott Garman +Index: openjade-1.3.2/spgrove/Makefile.sub +=================================================================== +--- openjade-1.3.2.orig/spgrove/Makefile.sub ++++ openjade-1.3.2/spgrove/Makefile.sub +@@ -1,8 +1,8 @@ + LTVERSION=0:1:0 + LIB=ospgrove + INCLUDE=-I$(srcdir)/../grove +-DEPLIBS=-lm -L$(TOP)/grove -L$(TOP)/grove/.libs \ +- -L$(TOP)/lib -L$(TOP)/lib/.libs \ ++DEPLIBS=-lm $(TOP)/grove \ ++ $(TOP)/lib \ + $(LIB_THREADS) + OBJS=GroveApp.o GroveBuilder.o SdNode.o + GENSRCS=grove_inst.cxx +Index: openjade-1.3.2/style/Makefile.sub +=================================================================== +--- openjade-1.3.2.orig/style/Makefile.sub ++++ openjade-1.3.2/style/Makefile.sub +@@ -1,8 +1,8 @@ + LTVERSION=0:1:0 + LIB=ostyle +-DEPLIBS=-lm -L$(TOP)/grove -L$(TOP)/grove/.libs \ +- -L$(TOP)/lib -L$(TOP)/lib/.libs \ +- -L$(TOP)/spgrove -L$(TOP)/spgrove/.libs ++DEPLIBS=-lm $(TOP)/grove \ ++ $(TOP)/lib \ ++ $(TOP)/spgrove + OBJS=LangObj.o \ + Collector.o \ + DssslApp.o \ 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 new file mode 100644 index 0000000000..48e38048ba --- /dev/null +++ b/meta/recipes-devtools/openjade/openjade-1.3.2/oj-native-libosp-fix.patch @@ -0,0 +1,15 @@ +Patch obtained from OpenEmbedded. + +Signed-off-by: Scott Garman +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@') + -- cgit v1.2.3-54-g00ecf