mirror of
https://git.yoctoproject.org/poky
synced 2026-05-31 00:39:46 +00:00
openssl: Convert to use do_install for staging
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
inherit pkgconfig native pkgconfig_stage
|
inherit native
|
||||||
|
|
||||||
require openssl.inc
|
require openssl.inc
|
||||||
|
|
||||||
@@ -12,11 +12,3 @@ SRC_URI += "file://debian.patch;patch=1 \
|
|||||||
file://configure-targets.patch;patch=1 \
|
file://configure-targets.patch;patch=1 \
|
||||||
file://shared-libs.patch;patch=1"
|
file://shared-libs.patch;patch=1"
|
||||||
|
|
||||||
PARALLEL_MAKE = ""
|
|
||||||
|
|
||||||
FILESPATH = "${@base_set_filespath( ['${FILE_DIRNAME}/openssl-${PV}', '${FILE_DIRNAME}/openssl', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
|
|
||||||
|
|
||||||
do_install() {
|
|
||||||
:
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|||||||
@@ -18,6 +18,10 @@ export DIRS = "crypto ssl apps"
|
|||||||
export EX_LIBS = "-lgcc -ldl"
|
export EX_LIBS = "-lgcc -ldl"
|
||||||
export AS = "${CC} -c"
|
export AS = "${CC} -c"
|
||||||
|
|
||||||
|
PARALLEL_MAKE = ""
|
||||||
|
|
||||||
|
inherit pkgconfig
|
||||||
|
|
||||||
PACKAGES =+ "libcrypto libssl"
|
PACKAGES =+ "libcrypto libssl"
|
||||||
FILES_libcrypto = "${libdir}/libcrypto.so.*"
|
FILES_libcrypto = "${libdir}/libcrypto.so.*"
|
||||||
FILES_libssl = "${libdir}/libssl.so.*"
|
FILES_libssl = "${libdir}/libssl.so.*"
|
||||||
@@ -80,12 +84,7 @@ do_compile () {
|
|||||||
oe_runmake
|
oe_runmake
|
||||||
}
|
}
|
||||||
|
|
||||||
do_stage () {
|
NATIVE_INSTALL_WORKS = "1"
|
||||||
cp --dereference -R include/openssl ${STAGING_INCDIR}/
|
|
||||||
oe_libinstall -a -so libcrypto ${STAGING_LIBDIR}
|
|
||||||
oe_libinstall -a -so libssl ${STAGING_LIBDIR}
|
|
||||||
}
|
|
||||||
|
|
||||||
do_install () {
|
do_install () {
|
||||||
install -m 0755 -d ${D}${libdir}/pkgconfig
|
install -m 0755 -d ${D}${libdir}/pkgconfig
|
||||||
oe_runmake INSTALL_PREFIX="${D}" install
|
oe_runmake INSTALL_PREFIX="${D}" install
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
inherit pkgconfig pkgconfig_stage
|
|
||||||
|
|
||||||
require openssl.inc
|
require openssl.inc
|
||||||
|
|
||||||
PR = "r10"
|
PR = "r10"
|
||||||
@@ -7,5 +5,3 @@ PR = "r10"
|
|||||||
SRC_URI += "file://debian.patch;patch=1 \
|
SRC_URI += "file://debian.patch;patch=1 \
|
||||||
file://configure-targets.patch;patch=1 \
|
file://configure-targets.patch;patch=1 \
|
||||||
file://shared-libs.patch;patch=1"
|
file://shared-libs.patch;patch=1"
|
||||||
|
|
||||||
PARALLEL_MAKE = ""
|
|
||||||
|
|||||||
Reference in New Issue
Block a user