[oe-commits] Holger Freyther : wvstreams: Add initial compiling and linking version. This is needed for wvdial

[GIT User account]

Module: openembedded.dev.git
Branch: holger/hash-style
Commit: 9956063810146b519b97df71ef0fdcda2fe81a98
URL:    http://gitweb.openembedded.net/?p=openembedded.dev.git&a=commit;h=9956063810146b519b97df71ef0fdcda2fe81a98

Author: Holger Freyther <zecke at selfish.org>
Date:   Sat Apr 12 15:02:56 2008 +0000

wvstreams: Add initial compiling and linking version. This is needed for wvdial
    - Cure some symptoms of the broken buildsystem

---

 conf/checksums.ini                                 |    4 +
 .../wvstreams/files/build-fixes-and-sanity.patch   |   84 ++++++++++++++++++++
 packages/wvstreams/wvstreams_4.4.1.bb              |   16 ++++
 3 files changed, 104 insertions(+), 0 deletions(-)

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 9f5304a..ff2be7e 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -14694,6 +14694,10 @@ sha256=cf688be96ba5f3227876b3412150e84a3cee60ddd0207b6d940d1fbbaf136b57
 md5=7bb22f2bcdeed54b3fb5407d6d8bc9bb
 sha256=2f9755e2e3f96d26380857ef95be7765e6e276f6b53194c70633c027485d67f0
 
+[http://wvstreams.googlecode.com/files/wvstreams-4.4.1.tar.gz]
+md5=907b0cba8931553d848620ea16f006b9
+sha256=cff48f9a87e94672c7a819661a3a5c893ee44e763c6e5775d00aff3de43619b1
+
 [http://downloads.sourceforge.net/wvware/wv-1.2.0.tar.gz]
 md5=b6319d5e75611fe2210453b5feb82c0c
 sha256=a76f44468e78591e6d510d326702e7c3999d2b9dd3ab8ab8c1c9811fd5b111e4
diff --git a/packages/wvstreams/files/build-fixes-and-sanity.patch b/packages/wvstreams/files/build-fixes-and-sanity.patch
new file mode 100644
index 0000000..1571d7b
--- /dev/null
+++ b/packages/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/packages/wvstreams/wvstreams_4.4.1.bb b/packages/wvstreams/wvstreams_4.4.1.bb
new file mode 100644
index 0000000..5a20840
--- /dev/null
+++ b/packages/wvstreams/wvstreams_4.4.1.bb
@@ -0,0 +1,16 @@
+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)"
+
+SRC_URI = "http://wvstreams.googlecode.com/files/${PN}-${PV}.tar.gz \
+           file://build-fixes-and-sanity.patch;patch=1 "
+
+inherit autotools
+
+LDFLAGS_append = " -Wl,-rpath-link,${CROSS_DIR}/${TARGET_SYS}/lib"
+
+EXTRA_AUTORECONF += " -I${S}/gnulib/m4"
+EXTRA_OECONF = " --without-tcl --without-qt --without-pam"
+
+