diff options
| author |   Chris Larson <clarson@kergoth.com> | 2003-11-21 18:27:14 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2003-11-21 18:27:14 +0000 |
| commit | e9b171e0738c2acef0650328b7f2e1ae7cdc55cc (patch) | |
| tree | 8afdd2f094195bb88a7a9636f5b9bd9f53ebb492 /openssl | |
| parent | acea8d73cb0c72991690d488915e426bf7e46675 (diff) | |
| download | openembedded-e9b171e0738c2acef0650328b7f2e1ae7cdc55cc.tar.gz | |
Numerous build fixes from an oemake -a run, including two more fixes for libtool 'libdir from .la file leaking into library search path' situations.
BKrev: 3fbe5902eywlLRHkRQ1FaDS5C01-jg
Diffstat (limited to 'openssl')
| -rw-r--r-- | openssl/openssl_0.9.7b.oe | 45 | ||||
| -rw-r--r-- | openssl/openssl_0.9.7c.oe | 17 |
2 files changed, 60 insertions, 2 deletions
diff --git a/openssl/openssl_0.9.7b.oe b/openssl/openssl_0.9.7b.oe index e69de29bb2..10cdbce083 100644 --- a/openssl/openssl_0.9.7b.oe +++ b/openssl/openssl_0.9.7b.oe @@ -0,0 +1,45 @@ +SRC_URI = http://www.openssl.org/source/${P}.tar.gz \ + file://${FILESDIR}/debian.patch;patch=1 +S = ${WORKDIR}/${PN}-${PV} + +DEPENDS = virtual/libc +SECTION = libs +DESCRIPTION = Secure Socket Layer (SSL) binary and related cryptographic tools. + +AR_append = " r" +export CFLAG = "-fPIC -DTHREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -DL_ENDIAN -DTERMIO -Wall ${FULL_OPTIMIZATION}" +export DIRS = "crypto ssl" +export EX_LIBS = "-lgcc -ldl -L${STAGING_LIBDIR}" + +do_compile () { + perl util/perlpath.pl /usr/bin + ln -sf apps/openssl.pod crypto/crypto.pod ssl/ssl.pod doc/ + if test "X${TARGET_OS}" = "Xlinux"; then + target=${TARGET_OS}-elf + else + target=${TARGET_OS} + fi + if ! test "X${BUILD_SYS}" = "X${TARGET_SYS}" -o \ + "X${TARGET_ARCH}" = "Xi386" -o \ + "X${TARGET_ARCH}" = "Xi686" -o \ + "X${TARGET_ARCH}" = "Xi586" -o \ + "X${TARGET_ARCH}" = "Xi486"; then + target="$target-${TARGET_ARCH}" + fi + 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_DIR}/target/include/ + install -m 0755 libcrypto.so.0.9.7 ${STAGING_LIBDIR}/ + ln -sf libcrypto.so.0.9.7 ${STAGING_LIBDIR}/libcrypto.so + install -m 0755 libssl.so.0.9.7 ${STAGING_LIBDIR}/ + ln -sf libssl.so.0.9.7 ${STAGING_LIBDIR}/libssl.so +} + +do_install () { + oe_runmake -f Makefile.ssl INSTALL_PREFIX="${D}" install +} diff --git a/openssl/openssl_0.9.7c.oe b/openssl/openssl_0.9.7c.oe index ba1495df1c..d3c8fdc52a 100644 --- a/openssl/openssl_0.9.7c.oe +++ b/openssl/openssl_0.9.7c.oe @@ -10,12 +10,25 @@ AR_append = " r" export CFLAG = "-fPIC -DTHREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -DL_ENDIAN -DTERMIO -Wall ${FULL_OPTIMIZATION}" export DIRS = "crypto ssl" export EX_LIBS = "-lgcc -ldl -L${STAGING_LIBDIR}" + do_compile () { perl util/perlpath.pl /usr/bin - perl ./Configure shared --prefix=/usr --openssldir=/usr/lib/ssl ${TARGET_OS}-elf-${TARGET_ARCH} ln -sf apps/openssl.pod crypto/crypto.pod ssl/ssl.pod doc/ + if test "X${TARGET_OS}" = "Xlinux"; then + target=${TARGET_OS}-elf + else + target=${TARGET_OS} + fi + if ! test "X${BUILD_SYS}" = "X${TARGET_SYS}" -o \ + "X${TARGET_ARCH}" = "Xi386" -o \ + "X${TARGET_ARCH}" = "Xi686" -o \ + "X${TARGET_ARCH}" = "Xi586" -o \ + "X${TARGET_ARCH}" = "Xi486"; then + target="$target-${TARGET_ARCH}" + fi + perl ./Configure shared --prefix=${prefix} --openssldir=${libdir}/ssl $target oe_runmake -f Makefile.ssl - perl ./Configure no-shared --prefix=/usr --openssldir=/usr/lib/ssl ${TARGET_OS}-elf-${TARGET_ARCH} + perl ./Configure no-shared --prefix=${prefix} --openssldir=${libdir}/ssl $target oe_runmake -f Makefile.ssl } |