diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2004-08-03 18:29:16 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2004-08-03 18:29:16 +0000 |
| commit | 2d23cd7954544c61b8e5cef52ad3bd86f19eaff1 (patch) | |
| tree | d617ef4acd4a5f9a5091d0b4ad795188b8f32d65 /openssl | |
| parent | 56531a03b2d00a4c75e767393d6a9373abfe311d (diff) | |
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
Diffstat (limited to 'openssl')
| -rw-r--r-- | openssl/openssl_0.9.7d.oe | 23 |
1 files changed, 13 insertions, 10 deletions
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} } |