summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/packages/openssl/openssl-native_0.9.8g.bb10
-rw-r--r--meta/packages/openssl/openssl.inc11
-rw-r--r--meta/packages/openssl/openssl_0.9.8g.bb4
3 files changed, 6 insertions, 19 deletions
diff --git a/meta/packages/openssl/openssl-native_0.9.8g.bb b/meta/packages/openssl/openssl-native_0.9.8g.bb
index 664895ce85..31f333f9e2 100644
--- a/meta/packages/openssl/openssl-native_0.9.8g.bb
+++ b/meta/packages/openssl/openssl-native_0.9.8g.bb
@@ -1,4 +1,4 @@
1inherit pkgconfig native pkgconfig_stage 1inherit native
2 2
3require openssl.inc 3require openssl.inc
4 4
@@ -12,11 +12,3 @@ SRC_URI += "file://debian.patch;patch=1 \
12 file://configure-targets.patch;patch=1 \ 12 file://configure-targets.patch;patch=1 \
13 file://shared-libs.patch;patch=1" 13 file://shared-libs.patch;patch=1"
14 14
15PARALLEL_MAKE = ""
16
17FILESPATH = "${@base_set_filespath( ['${FILE_DIRNAME}/openssl-${PV}', '${FILE_DIRNAME}/openssl', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
18
19do_install() {
20 :
21}
22
diff --git a/meta/packages/openssl/openssl.inc b/meta/packages/openssl/openssl.inc
index 2ec1d91e7a..fd0bbba58c 100644
--- a/meta/packages/openssl/openssl.inc
+++ b/meta/packages/openssl/openssl.inc
@@ -18,6 +18,10 @@ export DIRS = "crypto ssl apps"
18export EX_LIBS = "-lgcc -ldl" 18export EX_LIBS = "-lgcc -ldl"
19export AS = "${CC} -c" 19export AS = "${CC} -c"
20 20
21PARALLEL_MAKE = ""
22
23inherit pkgconfig
24
21PACKAGES =+ "libcrypto libssl" 25PACKAGES =+ "libcrypto libssl"
22FILES_libcrypto = "${libdir}/libcrypto.so.*" 26FILES_libcrypto = "${libdir}/libcrypto.so.*"
23FILES_libssl = "${libdir}/libssl.so.*" 27FILES_libssl = "${libdir}/libssl.so.*"
@@ -80,12 +84,7 @@ do_compile () {
80 oe_runmake 84 oe_runmake
81} 85}
82 86
83do_stage () { 87NATIVE_INSTALL_WORKS = "1"
84 cp --dereference -R include/openssl ${STAGING_INCDIR}/
85 oe_libinstall -a -so libcrypto ${STAGING_LIBDIR}
86 oe_libinstall -a -so libssl ${STAGING_LIBDIR}
87}
88
89do_install () { 88do_install () {
90 install -m 0755 -d ${D}${libdir}/pkgconfig 89 install -m 0755 -d ${D}${libdir}/pkgconfig
91 oe_runmake INSTALL_PREFIX="${D}" install 90 oe_runmake INSTALL_PREFIX="${D}" install
diff --git a/meta/packages/openssl/openssl_0.9.8g.bb b/meta/packages/openssl/openssl_0.9.8g.bb
index f83c5b293d..73335f36b4 100644
--- a/meta/packages/openssl/openssl_0.9.8g.bb
+++ b/meta/packages/openssl/openssl_0.9.8g.bb
@@ -1,5 +1,3 @@
1inherit pkgconfig pkgconfig_stage
2
3require openssl.inc 1require openssl.inc
4 2
5PR = "r10" 3PR = "r10"
@@ -7,5 +5,3 @@ PR = "r10"
7SRC_URI += "file://debian.patch;patch=1 \ 5SRC_URI += "file://debian.patch;patch=1 \
8 file://configure-targets.patch;patch=1 \ 6 file://configure-targets.patch;patch=1 \
9 file://shared-libs.patch;patch=1" 7 file://shared-libs.patch;patch=1"
10
11PARALLEL_MAKE = ""