aboutsummaryrefslogtreecommitdiff
path: root/recipes/openssl/openssl.inc
diff options
context:
space:
mode:
Diffstat (limited to 'recipes/openssl/openssl.inc')
-rw-r--r--recipes/openssl/openssl.inc48
1 files changed, 34 insertions, 14 deletions
diff --git a/recipes/openssl/openssl.inc b/recipes/openssl/openssl.inc
index 2ec1d91..7fd7ea0 100644
--- a/recipes/openssl/openssl.inc
+++ b/recipes/openssl/openssl.inc
@@ -3,11 +3,15 @@ HOMEPAGE = "http://www.openssl.org/"
LICENSE = "openssl"
SECTION = "libs/network"
-SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz"
+SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz;name=src"
S = "${WORKDIR}/openssl-${PV}"
+inherit siteinfo
+
+INC_PR = "r12"
+
AR_append = " r"
-CFLAG = "${@base_conditional('SITEINFO_ENDIANESS', 'le', '-DL_ENDIAN', '-DB_ENDIAN', d)} \
+CFLAG = "${@base_conditional('SITEINFO_ENDIANNESS', 'le', '-DL_ENDIAN', '-DB_ENDIAN', d)} \
-DTERMIO ${FULL_OPTIMIZATION} -Wall"
# -02 does not work on mipsel: ssh hangs when it tries to read /dev/urandom
@@ -18,9 +22,10 @@ export DIRS = "crypto ssl apps"
export EX_LIBS = "-lgcc -ldl"
export AS = "${CC} -c"
-PACKAGES =+ "libcrypto libssl"
-FILES_libcrypto = "${libdir}/libcrypto.so.*"
+PACKAGES =+ "libcrypto libssl ${PN}-misc"
+FILES_libcrypto = "${libdir}/libcrypto.so.* ${libdir}/ssl/openssl.cnf"
FILES_libssl = "${libdir}/libssl.so.*"
+FILES_${PN}-misc = "${libdir}/ssl/misc"
do_configure () {
cd util
@@ -31,6 +36,10 @@ do_configure () {
os=${HOST_OS}
if [ "x$os" = "xlinux-uclibc" ]; then
os=linux
+ elif [ "x$os" = "xlinux-uclibceabi" ]; then
+ os=linux
+ elif [ "x$os" = "xlinux-gnueabi" ]; then
+ os=linux
fi
target="$os-${HOST_ARCH}"
case $target in
@@ -49,7 +58,7 @@ do_configure () {
linux-i486)
target=debian-i386-i486
;;
- linux-i586)
+ linux-i586 | linux-viac3)
target=debian-i386-i586
;;
linux-i686)
@@ -64,6 +73,9 @@ do_configure () {
linux-powerpc)
target=linux-ppc
;;
+ linux-gnuspe-powerpc)
+ target=linux-ppc
+ ;;
linux-supersparc)
target=linux-sparcv8
;;
@@ -73,23 +85,31 @@ do_configure () {
esac
# inject machine-specific flags
sed -i -e "s|^\(\"$target\",\s*\"[^:]\+\):\([^:]\+\)|\1:${CFLAG}|g" Configure
- perl ./Configure shared --prefix=${prefix} --openssldir=${libdir}/ssl $target
+ useprefix=${prefix}
+ if [ "x$useprefix" == "x" ]; then
+ useprefix=/
+ fi
+ perl ./Configure shared --prefix=$useprefix --openssldir=${libdir}/ssl $target
}
do_compile () {
oe_runmake
}
-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 -m 0755 -d ${D}${libdir}/pkgconfig
oe_runmake INSTALL_PREFIX="${D}" install
- chmod 644 ${D}${libdir}/pkgconfig/openssl.pc
+
+ # On x86_64, move lib/* to lib64
+ if [ "${libdir}" != "${prefix}/lib" ]
+ then
+ install -d ${D}${libdir} ${D}${libdir}/pkgconfig
+ mv ${D}${prefix}/lib/lib* ${D}${libdir}
+ mv ${D}${prefix}/lib/pkgconfig/*.pc ${D}${libdir}/pkgconfig
+ fi
+
oe_libinstall -so libcrypto ${D}${libdir}
oe_libinstall -so libssl ${D}${libdir}
+
+ install -d ${D}${includedir}
+ cp --dereference -R include/openssl ${D}${includedir}
}