summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2018-07-09 11:12:53 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-29 15:23:50 +0100
commit805f8773d14601fdc8d235fde71d114fe704c68c (patch)
treef49a5cd89f5dc2055391dec3a03ec2dc0d2a8c36 /meta
parentfaa38162665a7f8719853a86050706822d716a14 (diff)
downloadpoky-805f8773d14601fdc8d235fde71d114fe704c68c.tar.gz
openssl_1.1: minor recipe formatting tweaks etc
Drop redundant setting of S to its default value and re-order variables to align more closely to the OE style-guide. (From OE-Core rev: 4871481e66449dd2b054119b37d0baedb166b72c) (From OE-Core rev: 5da668175ee7c56067c1272e7a701d5c38e94524) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.1.0h.bb50
1 files changed, 23 insertions, 27 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb b/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
index 64b8a997d0..8d445e4655 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
@@ -8,11 +8,6 @@ SECTION = "libs/network"
8LICENSE = "openssl" 8LICENSE = "openssl"
9LIC_FILES_CHKSUM = "file://LICENSE;md5=d57d511030c9d66ef5f5966bee5a7eff" 9LIC_FILES_CHKSUM = "file://LICENSE;md5=d57d511030c9d66ef5f5966bee5a7eff"
10 10
11BBCLASSEXTEND = "native nativesdk"
12
13SRC_URI[md5sum] = "5271477e4d93f4ea032b665ef095ff24"
14SRC_URI[sha256sum] = "5835626cde9e99656585fc7aaa2302a73a7e1340bf8c14fd635a62c66802a517"
15
16SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ 11SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
17 file://run-ptest \ 12 file://run-ptest \
18 file://openssl-c_rehash.sh \ 13 file://openssl-c_rehash.sh \
@@ -21,12 +16,24 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
21 16
22SRC_URI_append_class-nativesdk = " \ 17SRC_URI_append_class-nativesdk = " \
23 file://environment.d-openssl.sh \ 18 file://environment.d-openssl.sh \
24 " 19 "
25 20
26S = "${WORKDIR}/openssl-${PV}" 21SRC_URI[md5sum] = "5271477e4d93f4ea032b665ef095ff24"
22SRC_URI[sha256sum] = "5835626cde9e99656585fc7aaa2302a73a7e1340bf8c14fd635a62c66802a517"
27 23
28inherit lib_package multilib_header ptest 24inherit lib_package multilib_header ptest
29 25
26#| engines/afalg/e_afalg.c: In function 'eventfd':
27#| engines/afalg/e_afalg.c:110:20: error: '__NR_eventfd' undeclared (first use in this function)
28#| return syscall(__NR_eventfd, n);
29#| ^~~~~~~~~~~~
30EXTRA_OECONF_append_aarch64 = " no-afalgeng"
31
32#| ./libcrypto.so: undefined reference to `getcontext'
33#| ./libcrypto.so: undefined reference to `setcontext'
34#| ./libcrypto.so: undefined reference to `makecontext'
35EXTRA_OECONF_append_libc-musl = " -DOPENSSL_NO_ASYNC"
36
30do_configure () { 37do_configure () {
31 os=${HOST_OS} 38 os=${HOST_OS}
32 case $os in 39 case $os in
@@ -122,17 +129,6 @@ do_configure () {
122 perl ./Configure ${EXTRA_OECONF} --prefix=$useprefix --openssldir=${libdir}/ssl-1.1 --libdir=${libdirleaf} $target 129 perl ./Configure ${EXTRA_OECONF} --prefix=$useprefix --openssldir=${libdir}/ssl-1.1 --libdir=${libdirleaf} $target
123} 130}
124 131
125#| engines/afalg/e_afalg.c: In function 'eventfd':
126#| engines/afalg/e_afalg.c:110:20: error: '__NR_eventfd' undeclared (first use in this function)
127#| return syscall(__NR_eventfd, n);
128#| ^~~~~~~~~~~~
129EXTRA_OECONF_append_aarch64 = " no-afalgeng"
130
131#| ./libcrypto.so: undefined reference to `getcontext'
132#| ./libcrypto.so: undefined reference to `setcontext'
133#| ./libcrypto.so: undefined reference to `makecontext'
134EXTRA_OECONF_append_libc-musl = " -DOPENSSL_NO_ASYNC"
135
136do_install () { 132do_install () {
137 oe_runmake DESTDIR="${D}" MANDIR="${mandir}" MANSUFFIX=ssl install 133 oe_runmake DESTDIR="${D}" MANDIR="${mandir}" MANSUFFIX=ssl install
138 oe_multilib_header openssl/opensslconf.h 134 oe_multilib_header openssl/opensslconf.h
@@ -146,13 +142,11 @@ do_install_append_class-native () {
146 sed -i -e 's,/etc/openssl,${sysconfdir}/ssl,g' ${D}${bindir}/c_rehash 142 sed -i -e 's,/etc/openssl,${sysconfdir}/ssl,g' ${D}${bindir}/c_rehash
147} 143}
148 144
149do_install_append_class-nativesdk() { 145do_install_append_class-nativesdk () {
150 mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d 146 mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d
151 install -m 644 ${WORKDIR}/environment.d-openssl.sh ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh 147 install -m 644 ${WORKDIR}/environment.d-openssl.sh ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh
152} 148}
153 149
154FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/openssl.sh"
155
156do_install_ptest() { 150do_install_ptest() {
157 cp -r * ${D}${PTEST_PATH} 151 cp -r * ${D}${PTEST_PATH}
158 152
@@ -163,10 +157,12 @@ do_install_ptest() {
163 sed -i 's/$target{shared_extension_simple}/".so.ptest"/' ${D}${PTEST_PATH}/test/recipes/90-test_shlibload.t 157 sed -i 's/$target{shared_extension_simple}/".so.ptest"/' ${D}${PTEST_PATH}/test/recipes/90-test_shlibload.t
164} 158}
165 159
166RDEPENDS_${PN}-ptest += "perl-module-file-spec-functions bash python"
167
168FILES_${PN} =+ " ${libdir}/ssl-1.1/*"
169
170PACKAGES =+ "${PN}-engines" 160PACKAGES =+ "${PN}-engines"
161
162FILES_${PN} =+ "${libdir}/ssl-1.1/*"
163FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/openssl.sh"
171FILES_${PN}-engines = "${libdir}/engines-1.1" 164FILES_${PN}-engines = "${libdir}/engines-1.1"
172 165
166RDEPENDS_${PN}-ptest += "perl-module-file-spec-functions bash python"
167
168BBCLASSEXTEND = "native nativesdk"