[packages/openssl/OPENSSL_0_9_8] adjust use of find.pl local copy
glen
glen at pld-linux.org
Tue Sep 10 08:36:53 CEST 2013
commit 6e3101fe33dd6c5a156c853bdabf4be3962935a0
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Tue Sep 10 09:35:10 2013 +0300
adjust use of find.pl local copy
find.pl-deprecated.patch | 32 +-------------------------------
openssl.spec | 2 +-
2 files changed, 2 insertions(+), 32 deletions(-)
---
diff --git a/openssl.spec b/openssl.spec
index 0f6170b..76c43fa 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -213,7 +213,7 @@ sed -i -e 's|$prefix/lib/engines|/%{_lib}/engines|g' Configure
%build
touch Makefile.*
-%{__perl} util/perlpath.pl %{__perl}
+%{__perl} -Iutil util/perlpath.pl %{__perl}
OPTFLAGS="%{rpmcflags} %{?with_purify:-DPURIFY}" \
./Configure \
diff --git a/find.pl-deprecated.patch b/find.pl-deprecated.patch
index 71aac90..7eeb773 100644
--- a/find.pl-deprecated.patch
+++ b/find.pl-deprecated.patch
@@ -1,10 +1,9 @@
http://patches.openembedded.org/patch/29989/
-diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0i/find.pl b/meta/recipes-connectivity/openssl/openssl-1.0.0i/find.pl
new file mode 100644
index 0000000..8e1b42c
--- /dev/null
-+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0i/find.pl
++++ b/util/find.pl
@@ -0,0 +1,54 @@
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
+
@@ -60,32 +59,3 @@ index 0000000..8e1b42c
+}
+
+1;
-diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.0i.bb b/meta/recipes-connectivity/openssl/openssl_1.0.0i.bb
-index ca15a38..c233ba1 100644
---- a/meta/recipes-connectivity/openssl/openssl_1.0.0i.bb
-+++ b/meta/recipes-connectivity/openssl/openssl_1.0.0i.bb
-@@ -6,7 +6,7 @@ DEPENDS += "ocf-linux"
-
- CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS"
-
--PR = "${INC_PR}.2"
-+PR = "${INC_PR}.3"
-
- LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8"
-
-@@ -29,6 +29,7 @@ SRC_URI += "file://configure-targets.patch \
- file://debian/no-symbolic.patch \
- file://debian/debian-targets.patch \
- file://openssl_fix_for_x32.patch \
-+ file://find.pl \
- "
-
- SRC_URI[md5sum] = "b4df9c11af454fd68178c85a1d5f328f"
-@@ -43,3 +44,7 @@ FILES_${PN}-engines = "${libdir}/ssl/engines/*.so ${libdir}/engines"
- FILES_${PN}-engines-dbg = "${libdir}/ssl/engines/.debug"
-
- PARALLEL_MAKEINST = ""
-+
-+do_configure_prepend() {
-+ cp ${WORKDIR}/find.pl ${S}/util/find.pl
-+}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openssl.git/commitdiff/6e3101fe33dd6c5a156c853bdabf4be3962935a0
More information about the pld-cvs-commit
mailing list