Author: richard
Date: Wed Jan 14 15:14:34 2009
New Revision: 3823
URL: http://svn.slimdevices.com?rev=3823&root=Jive&view=rev
Log:
r3...@harrypotter (orig r3822): richard | 2009-01-14 23:13:21 +0000
Bug: N/A
Description:
Update to axtls receipe, we only want static linking.
Modified:
7.4/branches/pango/ (props changed)
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/axtls/axtls_1.2.0.bb
Propchange: 7.4/branches/pango/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Wed Jan 14 15:14:34 2009
@@ -4,7 +4,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2921
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/private-branches/jive-refresh:3653
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:3753
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:3814
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:3822
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/axtls/axtls_1.2.0.bb
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/axtls/axtls_1.2.0.bb?rev=3823&root=Jive&r1=3822&r2=3823&view=diff
==============================================================================
---
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/axtls/axtls_1.2.0.bb
(original)
+++
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/axtls/axtls_1.2.0.bb
Wed Jan 14 15:14:34 2009
@@ -1,18 +1,12 @@
DESCRIPTION = "axTLS SSL library"
SECTION = "libs"
-#PR = "r0"
+PR = "r1"
SRC_URI = "http://downloads.sourceforge.net/axtls/axTLS-${PV}.tar.gz \
file://axTLS.config \
"
S = "${WORKDIR}/axTLS"
-
-inherit autotools pkgconfig binconfig
-
-LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool"
-EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'"
-EXTRA_OECONF = "--without-zlib"
do_configure() {
cp ${WORKDIR}/axTLS.config ${S}/config/.config
@@ -31,11 +25,16 @@
install -m 0644 ${S}/ssl/ssl.h ${STAGING_INCDIR}/axTLS/ssl.h
install -m 0644 ${S}/ssl/tls1.h ${STAGING_INCDIR}/axTLS/tls1.h
install -m 0644 ${S}/ssl/version.h ${STAGING_INCDIR}/axTLS/version.h
- oe_libinstall -so -a -C _stage libaxtls ${STAGING_LIBDIR}/
+ oe_libinstall -a -C _stage libaxtls ${STAGING_LIBDIR}/
}
do_install() {
- PREFIX=${D} oe_runmake install
+ mkdir -p ${D}/usr/lib
+ PREFIX=${D}/usr oe_runmake install
+
+ # We _always_ want to staticaly link axtls, this seems to be
+ # the easiest way to ensure that
+ rm -f ${S}/_stage/libaxtls.so*
}
FILES_${PN} = "${libdir}/lib*${SOLIBS}"
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins