Merge bk://openembedded@openembedded.bkbits.net/packages

into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages

2004/08/03 20:29:10+02:00 uni-frankfurt.de!mickey
add unik-olsrd, a OLSR routing daemon. patch courtesy Bruno Randolf

2004/08/03 20:27:42+02:00 uni-frankfurt.de!mickey
mipsel fixes to openssl and tcpdump courtesy Bruno Randolf. note that I think we rather should fix those packages to honor our global CFLAGS in the long run.

BKrev: 410fd97cYX3L2oGnfeywaYWk951yBg

7 files changed, 30 insertions, 10 deletions

diff --git a/nonworking/esmart/esmart_cvs.oe b/nonworking/esmart/esmart_cvs.oe
index e69de29bb2..d12048e82b 100644
--- a/nonworking/esmart/esmart_cvs.oe
+++ b/nonworking/esmart/esmart_cvs.oe
@@ -0,0 +1,14 @@
+DESCRIPTION = "A collection of smart Evas objects"
+SECTION = "libs"
+DEPENDS = "evas evas-x11 ecore imlib2 edje libtool"
+PV = "${CVSDATE}"
+
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/esmart"
+S = "${WORKDIR}/esmart"
+
+inherit autotools pkgconfig binconfig
+
+do_stage () {
+	oe_libinstall -C src/lib libesmart ${STAGING_LIBDIR}/
+	install -m 0644 ${S}/src/lib/Esmart.h ${STAGING_INCDIR}/
+}
diff --git a/openssl/openssl_0.9.7d.oe b/openssl/openssl_0.9.7d.oe
index b8946e5997..9923790e6b 100644
--- a/openssl/openssl_0.9.7d.oe
+++ b/openssl/openssl_0.9.7d.oe
@@ -1,6 +1,6 @@
 SECTION = "libs"
 DESCRIPTION = "Secure Socket Layer (SSL) binary and related cryptographic tools."
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
 	   file://debian.patch;patch=1"
@@ -8,11 +8,16 @@ S = "${WORKDIR}/openssl-${PV}"
 
 AR_append = " r"
 export CFLAG = "-fPIC -DTHREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -DL_ENDIAN -DTERMIO -Wall ${FULL_OPTIMIZATION}"
-export DIRS = "crypto ssl"
+
+# -02 does not work on mipsel: ssh hangs when it tries to read /dev/urandom
+export CFLAG_mtx-1 := "${@'${CFLAG}'.replace('-O2', '')}"
+
+export DIRS = "crypto ssl apps"
 export EX_LIBS = "-lgcc -ldl -L${STAGING_LIBDIR}"
 
-PACKAGES =+ "libcrypto"
-FILES_libcrypto = "${libdir}/libcrypto.so.*"
+PACKAGES =+ "libcrypto libssl"
+FILES_libcrypto = "${libdir}/libcrypto.so*"
+FILES_libssl = "${libdir}/libssl.so*"
 
 do_compile () {
 	perl util/perlpath.pl ${bindir}
@@ -50,20 +55,18 @@ do_compile () {
 	esac
 	perl ./Configure shared --prefix=${prefix} --openssldir=${libdir}/ssl $target
 	oe_runmake -f Makefile.ssl
-	perl ./Configure no-shared --prefix=${prefix} --openssldir=${libdir}/ssl $target
-	oe_runmake -f Makefile.ssl
 }
 
 do_stage () {
 	cp --dereference -R include/openssl ${STAGING_INCDIR}/
-	oe_libinstall -a -so ${S}/libcrypto ${STAGING_LIBDIR}
-	oe_libinstall -a -so ${S}/libssl ${STAGING_LIBDIR}
+	oe_libinstall -a -so libcrypto ${STAGING_LIBDIR}
+	oe_libinstall -a -so libssl ${STAGING_LIBDIR}
 }
 
 do_install () {
 	install -m 0755 -d ${D}/${libdir}/pkgconfig
 	oe_runmake -f Makefile.ssl INSTALL_PREFIX="${D}" install
 	chmod 644 ${D}/${libdir}/pkgconfig/openssl.pc
-	oe_libinstall -so ${S}/libcrypto ${D}/${libdir}
-	oe_libinstall -so ${S}/libssl ${D}/${libdir}
+	oe_libinstall -so libcrypto ${D}/${libdir}
+	oe_libinstall -so libssl ${D}/${libdir}
 }
diff --git a/tcpdump/files/tcpdump_configure_no_-O2.patch b/tcpdump/files/tcpdump_configure_no_-O2.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tcpdump/files/tcpdump_configure_no_-O2.patch
diff --git a/tcpdump/tcpdump_3.8.3.oe b/tcpdump/tcpdump_3.8.3.oe
index 2adeec5ef2..981d4a95cc 100644
--- a/tcpdump/tcpdump_3.8.3.oe
+++ b/tcpdump/tcpdump_3.8.3.oe
@@ -4,9 +4,12 @@ PRIORITY = "optional"
 DEPENDS = "libpcap-0.8.1"
 
 SRC_URI = "http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz"
+SRC_URI_append_mtx-1 = " file://tcpdump_configure_no_-O2.patch;patch=1;pnum=1"
 
 inherit autotools 
 
+CFLAGS_mtx-1 := "${@'${CFLAGS}'.replace('-O2', '')}"
+
 do_configure() {
 	gnu-configize
 	oe_runconf
diff --git a/unik-olsrd/unik-olsrd-0.4.5/unik-olsrd b/unik-olsrd/unik-olsrd-0.4.5/unik-olsrd
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/unik-olsrd/unik-olsrd-0.4.5/unik-olsrd
diff --git a/unik-olsrd/unik-olsrd-0.4.5/unik-olsrd-0.4.5_Makefiles.diff b/unik-olsrd/unik-olsrd-0.4.5/unik-olsrd-0.4.5_Makefiles.diff
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/unik-olsrd/unik-olsrd-0.4.5/unik-olsrd-0.4.5_Makefiles.diff
diff --git a/unik-olsrd/unik-olsrd_0.4.5.oe b/unik-olsrd/unik-olsrd_0.4.5.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/unik-olsrd/unik-olsrd_0.4.5.oe