From 709c4d66e0b107ca606941b988bad717c0b45d9b Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Tue, 17 Mar 2009 14:32:59 -0400 Subject: rename packages/ to recipes/ per earlier agreement See links below for more details: http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326 http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816 Signed-off-by: Denys Dmytriyenko Acked-by: Mike Westerhof Acked-by: Philip Balister Acked-by: Khem Raj Acked-by: Marcin Juszkiewicz Acked-by: Koen Kooi Acked-by: Frans Meulenbroeks --- .../wvstreams/files/build-fixes-and-sanity.patch | 84 ++++++++++++++++++++++ recipes/wvstreams/files/wvstreams-debian.patch | 49 +++++++++++++ recipes/wvstreams/wvstreams_4.2.2.bb | 40 +++++++++++ recipes/wvstreams/wvstreams_4.4.1.bb | 38 ++++++++++ 4 files changed, 211 insertions(+) create mode 100644 recipes/wvstreams/files/build-fixes-and-sanity.patch create mode 100644 recipes/wvstreams/files/wvstreams-debian.patch create mode 100644 recipes/wvstreams/wvstreams_4.2.2.bb create mode 100644 recipes/wvstreams/wvstreams_4.4.1.bb (limited to 'recipes/wvstreams') diff --git a/recipes/wvstreams/files/build-fixes-and-sanity.patch b/recipes/wvstreams/files/build-fixes-and-sanity.patch new file mode 100644 index 0000000000..1571d7b3fe --- /dev/null +++ b/recipes/wvstreams/files/build-fixes-and-sanity.patch @@ -0,0 +1,84 @@ +Index: wvstreams-4.4.1/configure.ac +=================================================================== +--- wvstreams-4.4.1.orig/configure.ac 2007-08-30 04:47:54.000000000 +0200 ++++ wvstreams-4.4.1/configure.ac 2008-04-12 00:15:13.000000000 +0200 +@@ -445,7 +445,6 @@ + # tcl + if test "$with_tcl" != "no"; then + CPPFLAGS_save="$CPPFLAGS" +- WV_APPEND(CPPFLAGS, -I/usr/include/tcl8.3) + AC_CHECK_HEADERS(tcl.h,, [with_tcl=no]) + AC_CHECK_LIB(tcl8.3, TclInterpInit,, [with_tcl=no]) + if test "$with_tcl" != "no"; then +Index: wvstreams-4.4.1/Makefile +=================================================================== +--- wvstreams-4.4.1.orig/Makefile 2007-08-30 04:48:09.000000000 +0200 ++++ wvstreams-4.4.1/Makefile 2008-04-12 00:51:51.000000000 +0200 +@@ -76,7 +76,7 @@ + $(call configure) + + include/wvautoconf.h: include/wvautoconf.h.in +- $(call configure) ++ + + gnulib/Makefile: gnulib/Makefile.in + $(call configure) +@@ -97,9 +97,7 @@ + @touch $@ + + configure: configure.ac include/wvautoconf.h.in aclocal.m4 +- autoconf +- @rm -f config.mk include/wvautoconf.h gnulib/Makefile +- @touch $@ ++ @echo hey@ + + include/wvautoconf.h.in: configure.ac aclocal.m4 + autoheader +Index: wvstreams-4.4.1/config.mk.in +=================================================================== +--- wvstreams-4.4.1.orig/config.mk.in 2007-08-17 07:15:31.000000000 +0200 ++++ wvstreams-4.4.1/config.mk.in 2008-04-12 00:25:54.000000000 +0200 +@@ -31,6 +31,7 @@ + + prefix=@prefix@ + datadir=@datadir@ ++datarootdir=@datarootdir@ + includedir=@includedir@ + infodir=@infodir@ + localstatedir=@localstatedir@ +Index: wvstreams-4.4.1/vars.mk +=================================================================== +--- wvstreams-4.4.1.orig/vars.mk 2007-08-17 07:15:31.000000000 +0200 ++++ wvstreams-4.4.1/vars.mk 2008-04-12 01:44:03.000000000 +0200 +@@ -174,7 +174,7 @@ + + libwvutils.a libwvutils.so: $(filter-out $(BASEOBJS) $(TESTOBJS),$(call objects,utils)) gnulib/libgnu.a + libwvutils.so: libwvbase.so +-libwvutils.so: -lz -lcrypt ++libwvutils.so: LIBS+=-lz -lcrypt + + libwvstreams.a libwvstreams.so: $(filter-out $(BASEOBJS), \ + $(call objects,configfile crypto ipstreams \ +Index: wvstreams-4.4.1/wvrules.mk +=================================================================== +--- wvstreams-4.4.1.orig/wvrules.mk 2007-08-17 07:15:31.000000000 +0200 ++++ wvstreams-4.4.1/wvrules.mk 2008-04-12 01:00:05.000000000 +0200 +@@ -51,7 +51,7 @@ + LIBWVTEST=$(WVSTREAMS_LIB)/libwvtest.a $(LIBWVUTILS) + + # Default compiler we use for linking +-WVLINK_CC = gcc ++WVLINK_CC = $(CC) + + # FIXME: what does this do?? + XX_LIBS := $(XX_LIBS) $(shell $(CC) -lsupc++ -lgcc_eh 2>&1 | grep -q "undefined reference" && echo " -lsupc++ -lgcc_eh") +Index: wvstreams-4.4.1/xplc/config/config.mk.in +=================================================================== +--- wvstreams-4.4.1.orig/xplc/config/config.mk.in 2005-10-31 23:33:26.000000000 +0100 ++++ wvstreams-4.4.1/xplc/config/config.mk.in 2008-04-12 00:27:33.000000000 +0200 +@@ -49,4 +49,4 @@ + LN_S:=@LN_S@ + LIBS:=@LIBS@ + CVS2CL:=@CVS2CL@ +- ++datarootdir:=@datarootdir@ diff --git a/recipes/wvstreams/files/wvstreams-debian.patch b/recipes/wvstreams/files/wvstreams-debian.patch new file mode 100644 index 0000000000..5cb4837955 --- /dev/null +++ b/recipes/wvstreams/files/wvstreams-debian.patch @@ -0,0 +1,49 @@ +--- wvstreams.old/include/wvvector.h 2005-11-24 19:46:46.000000000 +0000 ++++ wvstreams-4.2.2/include/wvvector.h 2007-07-24 06:35:55.000000000 +0000 +@@ -358,7 +358,7 @@ + /** Returns a pointer to the current element */ + T *ptr() const + { +- return static_cast(cur()->data); ++ return static_cast(this->cur()->data); + } + + WvIterStuff(T); +@@ -368,7 +368,7 @@ + */ + bool get_autofree() const + { +- return link->get_autofree(); ++ return this->link->get_autofree(); + } + + /** +@@ -376,7 +376,7 @@ + */ + void set_autofree(bool autofree) + { +- link->set_autofree(autofree); ++ this->link->set_autofree(autofree); + } + + /** +@@ -386,7 +386,7 @@ + */ + void remove(bool destroy = true) + { +- WvVector::vec.remove(i, destroy); ++ WvVector::vec.remove(this->i, destroy); + } + + /** +@@ -404,8 +404,8 @@ + */ + void xremove(bool destroy = true) + { +- WvVector::vec.remove(i, destroy); +- prev(); ++ WvVector::vec.remove(this->i, destroy); ++ this->prev(); + } + }; + }; diff --git a/recipes/wvstreams/wvstreams_4.2.2.bb b/recipes/wvstreams/wvstreams_4.2.2.bb new file mode 100644 index 0000000000..5d5b0242be --- /dev/null +++ b/recipes/wvstreams/wvstreams_4.2.2.bb @@ -0,0 +1,40 @@ +HOMEPAGE = "http://alumnit.ca/wiki/index.php?page=WvStreams" +LICENSE = "LGPL" +DESCRIPTION = "WvStreams is a network programming library in C++" +DEPENDS = "zlib openssl (>= 0.9.8)" + +PR = "r1" + +SRC_URI = "http://ftp.de.debian.org/debian/pool/main/w/wvstreams/${PN}_${PV}.orig.tar.gz \ + http://ftp.de.debian.org/debian/pool/main/w/wvstreams/wvstreams_4.2.2-2.2.diff.gz;patch=1 \ + file://wvstreams-debian.patch;patch=1 \ + file://build-fixes-and-sanity.patch;patch=1 " + +inherit autotools pkgconfig + +LDFLAGS_append = " -Wl,-rpath-link,${CROSS_DIR}/${TARGET_SYS}/lib" + +EXTRA_AUTORECONF += " -I${S}/gnulib/m4" +EXTRA_OECONF = " --without-tcl --without-qt --without-pam" + +PACKAGES_prepend = "libuniconf libuniconf-dbg " +PACKAGES_prepend = "uniconfd uniconfd-dbg " +PACKAGES_prepend = "libwvstreams-base libwvstreams-base-dbg " +PACKAGES_prepend = "libwvstreams-extras libwvstreams-extras-dbg " + +FILES_libuniconf = "${libdir}/libuniconf.so.*" +FILES_libuniconf-dbg = "${libdir}/.debug/libuniconf.so.*" + +FILES_uniconfd = "${sbindir}/uniconfd ${sysconfdir}/uniconf.conf ${localstatedir}/uniconf" +FILES_uniconfd-dbg = "${sbindir}/.debug/uniconfd" + +FILES_libwvstreams-base = "${libdir}/libwvutils.so.*" +FILES_libwvstreams-base-dbg = "${libdir}/.debug/libwvutils.so.*" + +FILES_libwvstreams-extras = "${libdir}/libwvbase.so.* ${libdir}/libwvstreams.so.*" +FILES_libwvstreams-extras-dbg = "${libdir}/.debug/libwvbase.so.* ${libdir}/.debug/libwvstreams.so.*" + + +do_stage() { + autotools_stage_all +} diff --git a/recipes/wvstreams/wvstreams_4.4.1.bb b/recipes/wvstreams/wvstreams_4.4.1.bb new file mode 100644 index 0000000000..8cf1d1b5eb --- /dev/null +++ b/recipes/wvstreams/wvstreams_4.4.1.bb @@ -0,0 +1,38 @@ +HOMEPAGE = "http://alumnit.ca/wiki/index.php?page=WvStreams" +LICENSE = "LGPL" +DESCRIPTION = "WvStreams is a network programming library in C++" +DEPENDS = "zlib openssl (>= 0.9.8)" + +PR = "r2" + +SRC_URI = "http://wvstreams.googlecode.com/files/${PN}-${PV}.tar.gz \ + file://build-fixes-and-sanity.patch;patch=1 " + +inherit autotools pkgconfig + +LDFLAGS_append = " -Wl,-rpath-link,${CROSS_DIR}/${TARGET_SYS}/lib" + +EXTRA_AUTORECONF += " -I${S}/gnulib/m4" +EXTRA_OECONF = " --without-tcl --without-qt --without-pam" + +PACKAGES_prepend = "libuniconf libuniconf-dbg " +PACKAGES_prepend = "uniconfd uniconfd-dbg " +PACKAGES_prepend = "libwvstreams-base libwvstreams-base-dbg " +PACKAGES_prepend = "libwvstreams-extras libwvstreams-extras-dbg " + +FILES_libuniconf = "${libdir}/libuniconf.so.*" +FILES_libuniconf-dbg = "${libdir}/.debug/libuniconf.so.*" + +FILES_uniconfd = "${sbindir}/uniconfd ${sysconfdir}/uniconf.conf ${localstatedir}/uniconf" +FILES_uniconfd-dbg = "${sbindir}/.debug/uniconfd" + +FILES_libwvstreams-base = "${libdir}/libwvutils.so.*" +FILES_libwvstreams-base-dbg = "${libdir}/.debug/libwvutils.so.*" + +FILES_libwvstreams-extras = "${libdir}/libwvbase.so.* ${libdir}/libwvstreams.so.*" +FILES_libwvstreams-extras-dbg = "${libdir}/.debug/libwvbase.so.* ${libdir}/.debug/libwvstreams.so.*" + + +do_stage() { + autotools_stage_all +} -- cgit 1.2.3-korg