From: Michael Smith <msmith@cbnco.com>
To: openembedded-devel@lists.openembedded.org
Subject: [PATCH 4/4] openssl.inc: fix packaging on x86_64; use INC_PR
Date: Thu, 13 Aug 2009 11:00:41 -0400 [thread overview]
Message-ID: <1250175641-4869-4-git-send-email-msmith@cbnco.com> (raw)
In-Reply-To: <1250175641-4869-3-git-send-email-msmith@cbnco.com>
openssl's makefile always installs to ${prefix}/lib, even if
libdir is ${prefix}/lib64. Move some files around to make it fit.
Signed-off-by: Michael Smith <msmith@cbnco.com>
---
recipes/openssl/openssl-native_0.9.7g.bb | 2 +-
recipes/openssl/openssl-native_0.9.7m.bb | 2 +-
recipes/openssl/openssl-native_0.9.8g.bb | 2 +-
recipes/openssl/openssl-native_0.9.8j.bb | 2 +-
recipes/openssl/openssl.inc | 13 +++++++++++--
recipes/openssl/openssl_0.9.7e.bb | 2 +-
recipes/openssl/openssl_0.9.7g.bb | 2 +-
recipes/openssl/openssl_0.9.7m.bb | 2 +-
recipes/openssl/openssl_0.9.8g.bb | 2 +-
recipes/openssl/openssl_0.9.8j.bb | 2 +-
10 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/recipes/openssl/openssl-native_0.9.7g.bb b/recipes/openssl/openssl-native_0.9.7g.bb
index dfe3ab5..40558f2 100644
--- a/recipes/openssl/openssl-native_0.9.7g.bb
+++ b/recipes/openssl/openssl-native_0.9.7g.bb
@@ -2,7 +2,7 @@ inherit pkgconfig native
require openssl.inc
-PR = "r2"
+PR = "${INC_PR}.0"
SRC_URI += "file://debian.patch;patch=1 \
file://armeb.patch;patch=1;pnum=0 \
diff --git a/recipes/openssl/openssl-native_0.9.7m.bb b/recipes/openssl/openssl-native_0.9.7m.bb
index 445b6e9..ccae43e 100644
--- a/recipes/openssl/openssl-native_0.9.7m.bb
+++ b/recipes/openssl/openssl-native_0.9.7m.bb
@@ -6,7 +6,7 @@ require openssl.inc
export FULL_OPTIMIZATION = " "
export BUILD_OPTIMIZATION = " "
-PR = "r2"
+PR = "${INC_PR}.0"
SRC_URI += "file://debian.patch;patch=1 \
file://armeb.patch;patch=1;pnum=0 \
diff --git a/recipes/openssl/openssl-native_0.9.8g.bb b/recipes/openssl/openssl-native_0.9.8g.bb
index 27f0169..d567ae7 100644
--- a/recipes/openssl/openssl-native_0.9.8g.bb
+++ b/recipes/openssl/openssl-native_0.9.8g.bb
@@ -2,7 +2,7 @@ inherit pkgconfig native
require openssl.inc
-PR = "r1"
+PR = "${INC_PR}.0"
# This flag can contain target options (e.g -mfpu=neon for armv7-a systems)
export FULL_OPTIMIZATION = " "
diff --git a/recipes/openssl/openssl-native_0.9.8j.bb b/recipes/openssl/openssl-native_0.9.8j.bb
index ffbd5ea..976a4d7 100644
--- a/recipes/openssl/openssl-native_0.9.8j.bb
+++ b/recipes/openssl/openssl-native_0.9.8j.bb
@@ -2,7 +2,7 @@ inherit pkgconfig native
require openssl.inc
-PR = "r1"
+PR = "${INC_PR}.0"
# This flag can contain target options (e.g -mfpu=neon for armv7-a systems)
export FULL_OPTIMIZATION = " "
diff --git a/recipes/openssl/openssl.inc b/recipes/openssl/openssl.inc
index e6e345b..fd0756b 100644
--- a/recipes/openssl/openssl.inc
+++ b/recipes/openssl/openssl.inc
@@ -6,6 +6,8 @@ SECTION = "libs/network"
SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz"
S = "${WORKDIR}/openssl-${PV}"
+INC_PR = "r10"
+
AR_append = " r"
CFLAG = "${@base_conditional('SITEINFO_ENDIANESS', 'le', '-DL_ENDIAN', '-DB_ENDIAN', d)} \
-DTERMIO ${FULL_OPTIMIZATION} -Wall"
@@ -91,9 +93,16 @@ do_stage () {
}
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}
}
diff --git a/recipes/openssl/openssl_0.9.7e.bb b/recipes/openssl/openssl_0.9.7e.bb
index cda364a..b821076 100644
--- a/recipes/openssl/openssl_0.9.7e.bb
+++ b/recipes/openssl/openssl_0.9.7e.bb
@@ -1,6 +1,6 @@
require openssl.inc
-PR = "r6"
+PR = "${INC_PR}.0"
SRC_URI += "file://debian.patch;patch=1 \
file://armeb.patch;patch=1 \
diff --git a/recipes/openssl/openssl_0.9.7g.bb b/recipes/openssl/openssl_0.9.7g.bb
index fbd2af2..68a2614 100644
--- a/recipes/openssl/openssl_0.9.7g.bb
+++ b/recipes/openssl/openssl_0.9.7g.bb
@@ -2,7 +2,7 @@ inherit pkgconfig
require openssl.inc
-PR = "r7"
+PR = "${INC_PR}.0"
SRC_URI += "file://debian.patch;patch=1 \
file://armeb.patch;patch=1;pnum=0 \
diff --git a/recipes/openssl/openssl_0.9.7m.bb b/recipes/openssl/openssl_0.9.7m.bb
index fbd2af2..68a2614 100644
--- a/recipes/openssl/openssl_0.9.7m.bb
+++ b/recipes/openssl/openssl_0.9.7m.bb
@@ -2,7 +2,7 @@ inherit pkgconfig
require openssl.inc
-PR = "r7"
+PR = "${INC_PR}.0"
SRC_URI += "file://debian.patch;patch=1 \
file://armeb.patch;patch=1;pnum=0 \
diff --git a/recipes/openssl/openssl_0.9.8g.bb b/recipes/openssl/openssl_0.9.8g.bb
index 1cb360f..d76e756 100644
--- a/recipes/openssl/openssl_0.9.8g.bb
+++ b/recipes/openssl/openssl_0.9.8g.bb
@@ -2,7 +2,7 @@ inherit pkgconfig
require openssl.inc
-PR = "r9"
+PR = "${INC_PR}.0"
SRC_URI += "file://debian.patch;patch=1 \
file://configure-targets.patch;patch=1 \
diff --git a/recipes/openssl/openssl_0.9.8j.bb b/recipes/openssl/openssl_0.9.8j.bb
index 21450d2..bb9694f 100644
--- a/recipes/openssl/openssl_0.9.8j.bb
+++ b/recipes/openssl/openssl_0.9.8j.bb
@@ -2,7 +2,7 @@ inherit pkgconfig
require openssl.inc
-PR = "r2"
+PR = "${INC_PR}.0"
export OE_LDFLAGS="${LDFLAGS}"
--
1.6.3
next prev parent reply other threads:[~2009-08-13 15:17 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-13 15:00 [PATCH 1/4] site/x86_64-linux: Add some vars from ix86-common Michael Smith
2009-08-13 15:00 ` [PATCH 2/4] gcc: fix libstdc/libgcc packaging on x86_64 Michael Smith
2009-08-13 15:00 ` [PATCH 3/4] udev 141: fix " Michael Smith
2009-08-13 15:00 ` Michael Smith [this message]
2009-09-01 22:00 ` Michael Smith
2009-08-13 15:43 ` [PATCH 2/4] gcc: fix libstdc/libgcc " Khem Raj
2009-08-14 13:06 ` Michael Smith
2009-08-14 0:46 ` Douglas Royds
2009-08-14 13:06 ` Rolf Leggewie
2009-08-14 14:15 ` Michael Smith
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1250175641-4869-4-git-send-email-msmith@cbnco.com \
--to=msmith@cbnco.com \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox