summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-support/apr/apr-util_1.4.1.bb4
-rw-r--r--meta/recipes-support/attr/ea-acl.inc4
-rw-r--r--meta/recipes-support/boost/boost.inc12
-rw-r--r--meta/recipes-support/createrepo/createrepo_0.4.11.bb4
-rw-r--r--meta/recipes-support/curl/curl_7.26.0.bb8
-rw-r--r--meta/recipes-support/icu/icu-3.6.inc4
-rw-r--r--meta/recipes-support/libcap/libcap.inc8
-rw-r--r--meta/recipes-support/neon/neon_0.29.6.bb2
-rw-r--r--meta/recipes-support/shared-mime-info/shared-mime-info.inc4
-rw-r--r--meta/recipes-support/sqlite/sqlite3.inc4
10 files changed, 26 insertions, 28 deletions
diff --git a/meta/recipes-support/apr/apr-util_1.4.1.bb b/meta/recipes-support/apr/apr-util_1.4.1.bb
index 238af97a53..7ee3de5c08 100644
--- a/meta/recipes-support/apr/apr-util_1.4.1.bb
+++ b/meta/recipes-support/apr/apr-util_1.4.1.bb
@@ -37,10 +37,10 @@ do_configure_append() {
37 cp ${STAGING_DATADIR}/apr/apr_rules.mk ${S}/build/rules.mk 37 cp ${STAGING_DATADIR}/apr/apr_rules.mk ${S}/build/rules.mk
38 fi 38 fi
39} 39}
40do_configure_prepend_virtclass-native() { 40do_configure_prepend_class-native() {
41 cp ${STAGING_DATADIR_NATIVE}/apr/apr_rules.mk ${S}/build/rules.mk 41 cp ${STAGING_DATADIR_NATIVE}/apr/apr_rules.mk ${S}/build/rules.mk
42} 42}
43do_configure_append_virtclass-native() { 43do_configure_append_class-native() {
44 sed -i "s#LIBTOOL=\$(SHELL) \$(apr_builddir)#LIBTOOL=\$(SHELL) ${STAGING_BINDIR_NATIVE}#" ${S}/build/rules.mk 44 sed -i "s#LIBTOOL=\$(SHELL) \$(apr_builddir)#LIBTOOL=\$(SHELL) ${STAGING_BINDIR_NATIVE}#" ${S}/build/rules.mk
45 # sometimes there isn't SHELL 45 # sometimes there isn't SHELL
46 sed -i "s#LIBTOOL=\$(apr_builddir)#LIBTOOL=${STAGING_BINDIR_NATIVE}#" ${S}/build/rules.mk 46 sed -i "s#LIBTOOL=\$(apr_builddir)#LIBTOOL=${STAGING_BINDIR_NATIVE}#" ${S}/build/rules.mk
diff --git a/meta/recipes-support/attr/ea-acl.inc b/meta/recipes-support/attr/ea-acl.inc
index 0f506bc3cb..bcc7acc745 100644
--- a/meta/recipes-support/attr/ea-acl.inc
+++ b/meta/recipes-support/attr/ea-acl.inc
@@ -9,7 +9,7 @@ inherit autotools gettext
9# overwritten by autoheader 9# overwritten by autoheader
10export AUTOHEADER = "true" 10export AUTOHEADER = "true"
11EXTRA_OECONF = "INSTALL_USER=root INSTALL_GROUP=root" 11EXTRA_OECONF = "INSTALL_USER=root INSTALL_GROUP=root"
12EXTRA_OECONF_append_virtclass-native = " --enable-gettext=no" 12EXTRA_OECONF_append_class-native = " --enable-gettext=no"
13 13
14EXTRA_OEMAKE = "PKG_LIB_DIR=${base_libdir} PKG_DEVLIB_DIR=${libdir}" 14EXTRA_OEMAKE = "PKG_LIB_DIR=${base_libdir} PKG_DEVLIB_DIR=${libdir}"
15 15
@@ -55,4 +55,4 @@ fix_symlink () {
55 ln -sf ${libdir}/lib${BPN}.la ${base_libdir}/lib${BPN}.la 55 ln -sf ${libdir}/lib${BPN}.la ${base_libdir}/lib${BPN}.la
56 fi 56 fi
57} 57}
58SSTATEPOSTINSTFUNCS_virtclass-native += "fix_symlink" 58SSTATEPOSTINSTFUNCS_class-native += "fix_symlink"
diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc
index ec602a6cf4..36a94e10ea 100644
--- a/meta/recipes-support/boost/boost.inc
+++ b/meta/recipes-support/boost/boost.inc
@@ -7,7 +7,7 @@ DESCRIPTION = "Free peer-reviewed portable C++ source libraries"
7HOMEPAGE = "http://www.boost.org/" 7HOMEPAGE = "http://www.boost.org/"
8SECTION = "libs" 8SECTION = "libs"
9DEPENDS = "boost-native zlib" 9DEPENDS = "boost-native zlib"
10DEPENDS_virtclass-native = "" 10DEPENDS_class-native = ""
11LICENSE = "BSL-1.0 & MIT & Python-2.0" 11LICENSE = "BSL-1.0 & MIT & Python-2.0"
12 12
13ARM_INSTRUCTION_SET = "arm" 13ARM_INSTRUCTION_SET = "arm"
@@ -73,7 +73,7 @@ FILES_${PN}-staticdev = "${libdir}/libboost_*.a"
73# "boost" is a metapackage which pulls in all boost librabries 73# "boost" is a metapackage which pulls in all boost librabries
74PACKAGES += "${PN}" 74PACKAGES += "${PN}"
75RRECOMMENDS_${PN} += "${BOOST_PACKAGES}" 75RRECOMMENDS_${PN} += "${BOOST_PACKAGES}"
76RRECOMMENDS_${PN}_virtclass-native = "" 76RRECOMMENDS_${PN}_class-native = ""
77ALLOW_EMPTY_${PN} = "1" 77ALLOW_EMPTY_${PN} = "1"
78 78
79# to avoid GNU_HASH QA errors added LDFLAGS to ARCH; a little bit dirty but at least it works 79# to avoid GNU_HASH QA errors added LDFLAGS to ARCH; a little bit dirty but at least it works
@@ -176,15 +176,15 @@ do_install() {
176 176
177BBCLASSEXTEND = "native" 177BBCLASSEXTEND = "native"
178 178
179do_configure_virtclass-native() { 179do_configure_class-native() {
180 : 180 :
181} 181}
182 182
183do_boostconfig_virtclass-native() { 183do_boostconfig_class-native() {
184 : 184 :
185} 185}
186 186
187do_compile_virtclass-native() { 187do_compile_class-native() {
188 set -ex 188 set -ex
189 cd ${S}/tools/build/v2/engine 189 cd ${S}/tools/build/v2/engine
190 rm -rf bin.* 190 rm -rf bin.*
@@ -194,7 +194,7 @@ do_compile_virtclass-native() {
194# This is too terrible - the build script doesn't give any good 194# This is too terrible - the build script doesn't give any good
195# way I can see to find out where the binaries are placed, so 195# way I can see to find out where the binaries are placed, so
196# rely on only one bin.foo directory being created. 196# rely on only one bin.foo directory being created.
197do_install_virtclass-native () { 197do_install_class-native () {
198 set -ex 198 set -ex
199 cd ${S}/tools/build/v2/engine 199 cd ${S}/tools/build/v2/engine
200 install -d ${D}${bindir}/ 200 install -d ${D}${bindir}/
diff --git a/meta/recipes-support/createrepo/createrepo_0.4.11.bb b/meta/recipes-support/createrepo/createrepo_0.4.11.bb
index 344cc77770..8d2dcdf958 100644
--- a/meta/recipes-support/createrepo/createrepo_0.4.11.bb
+++ b/meta/recipes-support/createrepo/createrepo_0.4.11.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://createrepo.baseurl.org/"
4LICENSE = "GPLv2+" 4LICENSE = "GPLv2+"
5LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760" 5LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760"
6 6
7RDEPENDS_${PN}_virtclass-native += "libxml2-native rpm-native" 7RDEPENDS_${PN}_class-native += "libxml2-native rpm-native"
8 8
9PR = "r7" 9PR = "r7"
10 10
@@ -28,7 +28,7 @@ do_install () {
28# Wrap the python script since the native python is 28# Wrap the python script since the native python is
29# ${bindir}/python-native/python, and the "#! /usr/bin/env python" can't 29# ${bindir}/python-native/python, and the "#! /usr/bin/env python" can't
30# find it since it is not in PATH. 30# find it since it is not in PATH.
31do_install_append_virtclass-native () { 31do_install_append_class-native () {
32 # Not all the python scripts should be wrapped since some of 32 # Not all the python scripts should be wrapped since some of
33 # them are modules (be imported). 33 # them are modules (be imported).
34 for i in ${D}${datadir}/createrepo/genpkgmetadata.py \ 34 for i in ${D}${datadir}/createrepo/genpkgmetadata.py \
diff --git a/meta/recipes-support/curl/curl_7.26.0.bb b/meta/recipes-support/curl/curl_7.26.0.bb
index dad5572dff..9a0e7ce27e 100644
--- a/meta/recipes-support/curl/curl_7.26.0.bb
+++ b/meta/recipes-support/curl/curl_7.26.0.bb
@@ -6,8 +6,8 @@ LICENSE = "MIT"
6LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e664ac" 6LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e664ac"
7 7
8DEPENDS = "zlib gnutls" 8DEPENDS = "zlib gnutls"
9DEPENDS_virtclass-native = "zlib-native openssl-native" 9DEPENDS_class-native = "zlib-native openssl-native"
10DEPENDS_virtclass-nativesdk = "nativesdk-zlib" 10DEPENDS_class-nativesdk = "nativesdk-zlib"
11PR = "r1" 11PR = "r1"
12 12
13SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ 13SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
@@ -29,8 +29,8 @@ EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
29 " 29 "
30 30
31CURLGNUTLS = " --with-gnutls=${STAGING_LIBDIR}/../ --without-ssl" 31CURLGNUTLS = " --with-gnutls=${STAGING_LIBDIR}/../ --without-ssl"
32CURLGNUTLS_virtclass-native = "--without-gnutls --with-ssl" 32CURLGNUTLS_class-native = "--without-gnutls --with-ssl"
33CURLGNUTLS_virtclass-nativesdk = "--without-gnutls --without-ssl" 33CURLGNUTLS_class-nativesdk = "--without-gnutls --without-ssl"
34 34
35do_configure_prepend() { 35do_configure_prepend() {
36 sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g configure.ac 36 sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g configure.ac
diff --git a/meta/recipes-support/icu/icu-3.6.inc b/meta/recipes-support/icu/icu-3.6.inc
index d969caa0ae..272f6d15ba 100644
--- a/meta/recipes-support/icu/icu-3.6.inc
+++ b/meta/recipes-support/icu/icu-3.6.inc
@@ -11,12 +11,12 @@ BASE_SRC_URI = "ftp://ftp.software.ibm.com/software/globalization/icu/3.6/icu4c-
11SRC_URI = "${BASE_SRC_URI} \ 11SRC_URI = "${BASE_SRC_URI} \
12 file://noldlibpath.patch \ 12 file://noldlibpath.patch \
13 " 13 "
14SRC_URI_virtclass-native = "${BASE_SRC_URI}" 14SRC_URI_class-native = "${BASE_SRC_URI}"
15 15
16LICENSE = "ICU" 16LICENSE = "ICU"
17LIC_FILES_CHKSUM = "file://../license.html;md5=5c94767cedb5d6987c902ac850ded2c6" 17LIC_FILES_CHKSUM = "file://../license.html;md5=5c94767cedb5d6987c902ac850ded2c6"
18DEPENDS = "icu-native" 18DEPENDS = "icu-native"
19DEPENDS_virtclass-native = "" 19DEPENDS_class-native = ""
20 20
21S = "${WORKDIR}/icu/source" 21S = "${WORKDIR}/icu/source"
22 22
diff --git a/meta/recipes-support/libcap/libcap.inc b/meta/recipes-support/libcap/libcap.inc
index 27552ad49b..7f16a569c8 100644
--- a/meta/recipes-support/libcap/libcap.inc
+++ b/meta/recipes-support/libcap/libcap.inc
@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://License;md5=3f84fd6f29d453a56514cb7e4ead25f1"
7 7
8DEPENDS = "attr perl-native-runtime" 8DEPENDS = "attr perl-native-runtime"
9DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 9DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
10# attr and pam are disabled by EXTRA_OEMAKE_virtclass-native 10# attr and pam are disabled by EXTRA_OEMAKE_class-native
11DEPENDS_virtclass-native = "perl-native-runtime" 11DEPENDS_class-native = "perl-native-runtime"
12 12
13SRC_URI = "${DEBIAN_MIRROR}/main/libc/libcap2/${BPN}2_${PV}.orig.tar.gz" 13SRC_URI = "${DEBIAN_MIRROR}/main/libc/libcap2/${BPN}2_${PV}.orig.tar.gz"
14 14
@@ -23,15 +23,13 @@ do_configure() {
23 sed -e 's,BUILD_CFLAGS ?=,BUILD_CFLAGS := $(BUILD_CFLAGS),' -i Make.Rules 23 sed -e 's,BUILD_CFLAGS ?=,BUILD_CFLAGS := $(BUILD_CFLAGS),' -i Make.Rules
24} 24}
25 25
26BUILD_LDFLAGS_virtclass_native += "-Wl,rpath=${base_libdir}"
27
28EXTRA_OEMAKE = " \ 26EXTRA_OEMAKE = " \
29 LIBATTR=yes \ 27 LIBATTR=yes \
30 PAM_CAP=${@base_contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)} \ 28 PAM_CAP=${@base_contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)} \
31 INDENT= SYSTEM_HEADERS=${STAGING_INCDIR} RAISE_SETFCAP=no \ 29 INDENT= SYSTEM_HEADERS=${STAGING_INCDIR} RAISE_SETFCAP=no \
32 lib=${@os.path.basename('${libdir}')} \ 30 lib=${@os.path.basename('${libdir}')} \
33" 31"
34EXTRA_OEMAKE_virtclass-native = " \ 32EXTRA_OEMAKE_class-native = " \
35 LIBATTR=no \ 33 LIBATTR=no \
36 PAM_CAP=no \ 34 PAM_CAP=no \
37 INDENT= \ 35 INDENT= \
diff --git a/meta/recipes-support/neon/neon_0.29.6.bb b/meta/recipes-support/neon/neon_0.29.6.bb
index 170a47c9da..42d5e52fef 100644
--- a/meta/recipes-support/neon/neon_0.29.6.bb
+++ b/meta/recipes-support/neon/neon_0.29.6.bb
@@ -5,7 +5,7 @@ LICENSE = "LGPLv2+"
5LIC_FILES_CHKSUM = "file://src/COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a \ 5LIC_FILES_CHKSUM = "file://src/COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a \
6 file://src/ne_utils.h;beginline=1;endline=20;md5=2caca609538eddaa6f6adf120a218037" 6 file://src/ne_utils.h;beginline=1;endline=20;md5=2caca609538eddaa6f6adf120a218037"
7DEPENDS = "zlib libxml2 expat time gnutls libproxy" 7DEPENDS = "zlib libxml2 expat time gnutls libproxy"
8DEPENDS_virtclass-native = "zlib-native libxml2-native expat-native gnutls-native" 8DEPENDS_class-native = "zlib-native libxml2-native expat-native gnutls-native"
9 9
10PR = "r2" 10PR = "r2"
11 11
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info.inc b/meta/recipes-support/shared-mime-info/shared-mime-info.inc
index d7fa67c4c2..93f6010f11 100644
--- a/meta/recipes-support/shared-mime-info/shared-mime-info.inc
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info.inc
@@ -6,7 +6,7 @@ LICENSE = "LGPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" 6LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
7 7
8DEPENDS = "libxml2 intltool-native glib-2.0 shared-mime-info-native" 8DEPENDS = "libxml2 intltool-native glib-2.0 shared-mime-info-native"
9DEPENDS_virtclass-native = "libxml2-native intltool-native glib-2.0-native" 9DEPENDS_class-native = "libxml2-native intltool-native glib-2.0-native"
10 10
11SRC_URI = "http://freedesktop.org/~hadess/shared-mime-info-${PV}.tar.xz" 11SRC_URI = "http://freedesktop.org/~hadess/shared-mime-info-${PV}.tar.xz"
12 12
@@ -29,7 +29,7 @@ do_install () {
29 update-mime-database ${D}${datadir}/mime 29 update-mime-database ${D}${datadir}/mime
30} 30}
31 31
32do_install_virtclass-native () { 32do_install_class-native () {
33 autotools_do_install 33 autotools_do_install
34} 34}
35 35
diff --git a/meta/recipes-support/sqlite/sqlite3.inc b/meta/recipes-support/sqlite/sqlite3.inc
index 70841f88cb..e94c6ef8f0 100644
--- a/meta/recipes-support/sqlite/sqlite3.inc
+++ b/meta/recipes-support/sqlite/sqlite3.inc
@@ -2,13 +2,13 @@ DESCRIPTION = "An Embeddable SQL Database Engine"
2HOMEPAGE = "http://www.sqlite.org" 2HOMEPAGE = "http://www.sqlite.org"
3SECTION = "libs" 3SECTION = "libs"
4DEPENDS = "readline ncurses" 4DEPENDS = "readline ncurses"
5DEPENDS_virtclass-native = "" 5DEPENDS_class-native = ""
6LICENSE = "PD" 6LICENSE = "PD"
7 7
8inherit autotools pkgconfig 8inherit autotools pkgconfig
9 9
10EXTRA_OECONF = "--disable-tcl --enable-shared --enable-threadsafe" 10EXTRA_OECONF = "--disable-tcl --enable-shared --enable-threadsafe"
11EXTRA_OECONF_virtclass-native = "--disable-tcl --enable-shared --enable-threadsafe --disable-readline --enable-tempstore" 11EXTRA_OECONF_class-native = "--disable-tcl --enable-shared --enable-threadsafe --disable-readline --enable-tempstore"
12export config_BUILD_CC = "${BUILD_CC}" 12export config_BUILD_CC = "${BUILD_CC}"
13export config_BUILD_CFLAGS = "${BUILD_CFLAGS}" 13export config_BUILD_CFLAGS = "${BUILD_CFLAGS}"
14export config_BUILD_LIBS = "${BUILD_LDFLAGS}" 14export config_BUILD_LIBS = "${BUILD_LDFLAGS}"