diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-05-09 03:00:50 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-05-09 03:00:50 +0000 |
| commit | 2bbcacb70e3ac67ab7a2ec7bace5f91c2560f635 (patch) | |
| tree | 0c0e1e2663501f3d271fb082f8fee20eb3fd0f38 /openssl | |
| parent | ea4f4c02e9679dfb2978f3d9a9042f2f7ed0ec08 (diff) | |
Merge openembedded@openembedded.bkbits.net:packages
into linux.local:/home/kergoth/code/packages
2004/05/08 23:00:41-04:00 local!kergoth
Upgrade the alsa packages to 1.0.4.
2004/05/08 22:17:13-04:00 local!kergoth
Fix compile error with adns, resulting from a function definition not matching the declaration.
2004/05/08 18:00:51-04:00 local!kergoth
Merge openembedded@openembedded.bkbits.net:packages
into linux.local:/home/kergoth/code/packages
2004/05/08 13:59:20-04:00 local!kergoth
Merge openembedded@openembedded.bkbits.net:packages
into linux.local:/home/kergoth/code/packages
2004/05/08 13:59:15-04:00 local!kergoth
Fixing up the libtool-native/libtool-cross mess.
2004/05/08 13:59:04-04:00 local!kergoth
Bugfix in ncurses usage of oe_libinstall.
2004/05/07 21:46:16-04:00 local!kergoth
Merge
2004/05/07 21:45:26-04:00 local!kergoth
Adapt some .oe's to use oe_libinstall.
BKrev: 409d9ee2NnxGHPWH0kUIfg5f6DoPcQ
Diffstat (limited to 'openssl')
| -rw-r--r-- | openssl/openssl_0.9.7b.oe | 4 | ||||
| -rw-r--r-- | openssl/openssl_0.9.7c.oe | 6 | ||||
| -rw-r--r-- | openssl/openssl_0.9.7d.oe | 45 |
3 files changed, 49 insertions, 6 deletions
diff --git a/openssl/openssl_0.9.7b.oe b/openssl/openssl_0.9.7b.oe index ce88c79745..47c1c07d69 100644 --- a/openssl/openssl_0.9.7b.oe +++ b/openssl/openssl_0.9.7b.oe @@ -34,8 +34,8 @@ do_compile () { do_stage () { cp --dereference -R include/openssl ${STAGING_INCDIR}/ - oe_soinstall libcrypto.so.0.9.7 ${STAGING_LIBDIR}/ - oe_soinstall libssl.so.0.9.7 ${STAGING_LIBDIR}/ + oe_libinstall -so libcrypto ${STAGING_LIBDIR} + oe_libinstall -so libssl ${STAGING_LIBDIR} } do_install () { diff --git a/openssl/openssl_0.9.7c.oe b/openssl/openssl_0.9.7c.oe index 526f42513b..a37ad9a43b 100644 --- a/openssl/openssl_0.9.7c.oe +++ b/openssl/openssl_0.9.7c.oe @@ -34,10 +34,8 @@ do_compile () { do_stage () { cp --dereference -R include/openssl ${STAGING_INCDIR}/ - oe_soinstall libcrypto.so.0.9.7 ${STAGING_LIBDIR}/ - oe_soinstall libssl.so.0.9.7 ${STAGING_LIBDIR}/ - install -m 0644 libcrypto.a ${STAGING_LIBDIR}/ - install -m 0644 libssl.a ${STAGING_LIBDIR}/ + oe_libinstall -a -so libcrypto ${STAGING_LIBDIR} + oe_libinstall -a -so libssl ${STAGING_LIBDIR} } do_install () { diff --git a/openssl/openssl_0.9.7d.oe b/openssl/openssl_0.9.7d.oe index e69de29bb2..c65bf4b94e 100644 --- a/openssl/openssl_0.9.7d.oe +++ b/openssl/openssl_0.9.7d.oe @@ -0,0 +1,45 @@ +DEPENDS = "virtual/libc" +SECTION = "libs" +DESCRIPTION = "Secure Socket Layer (SSL) binary and related cryptographic tools." + +SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz" +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" +export EX_LIBS = "-lgcc -ldl -L${STAGING_LIBDIR}" + +do_compile () { + perl util/perlpath.pl ${bindir} + 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_INCDIR}/ + oe_libinstall -a -so libcrypto ${STAGING_LIBDIR} + oe_libinstall -a -so libssl ${STAGING_LIBDIR} +} + +do_install () { + install -d ${D}/${libdir}/pkgconfig + oe_runmake -f Makefile.ssl INSTALL_PREFIX="${D}" install + chmod u+rx ${D}/${libdir}/pkgconfig + chmod 644 ${D}/${libdir}/pkgconfig/openssl.pc +} |