diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-27 18:01:44 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-28 14:00:21 +0000 |
| commit | 006b8a7808a58713af16c326dc37d07765334b12 (patch) | |
| tree | 7fb385008db2170db8de182851c26e1156944de1 /meta | |
| parent | 9d796611afc42bea5ad9cab47ba4fb5ac0cb5ddd (diff) | |
| download | openembedded-core-006b8a7808a58713af16c326dc37d07765334b12.tar.gz openembedded-core-006b8a7808a58713af16c326dc37d07765334b12.tar.bz2 openembedded-core-006b8a7808a58713af16c326dc37d07765334b12.zip | |
autotools-brokensep: Mark recipes with broken separate build dir support
This patch goes through the OE-Core recipes and marks those which use autotools
but don't support a separate build directory (${S} != ${B}). A new class,
autotools-brokensep is used for this purpose.
This doesn't introduce any change in behaviour in its own right.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
69 files changed, 74 insertions, 67 deletions
diff --git a/meta/classes/autotools-brokensep.bbclass b/meta/classes/autotools-brokensep.bbclass new file mode 100644 index 0000000000..71cf97a391 --- /dev/null +++ b/meta/classes/autotools-brokensep.bbclass @@ -0,0 +1,5 @@ +# Autotools class for recipes where separate build dir doesn't work +# Ideally we should fix software so it does work. Standard autotools supports +# this. +inherit autotools +B = "${S}" diff --git a/meta/recipes-bsp/setserial/setserial_2.17.bb b/meta/recipes-bsp/setserial/setserial_2.17.bb index 8f112ed6ad..65d6068d15 100644 --- a/meta/recipes-bsp/setserial/setserial_2.17.bb +++ b/meta/recipes-bsp/setserial/setserial_2.17.bb @@ -8,7 +8,7 @@ LICENSE = "GPLv2.0" LIC_FILES_CHKSUM = "file://version.h;beginline=1;endline=6;md5=2e7c59cb9e57e356ae81f50f4e4dfd99" PR = "r3" -inherit autotools +inherit autotools-brokensep SRC_URI = "${SOURCEFORGE_MIRROR}/setserial/${BPN}-${PV}.tar.gz \ file://add_stdlib.patch \ diff --git a/meta/recipes-connectivity/bind/bind_9.8.1.bb b/meta/recipes-connectivity/bind/bind_9.8.1.bb index 19a9f056fa..e12bb392f3 100644 --- a/meta/recipes-connectivity/bind/bind_9.8.1.bb +++ b/meta/recipes-connectivity/bind/bind_9.8.1.bb @@ -33,7 +33,7 @@ EXTRA_OECONF = " ${ENABLE_IPV6} --with-randomdev=/dev/random --disable-threads \ --with-openssl=${STAGING_LIBDIR}/.. --with-libxml2=${STAGING_LIBDIR}/.. \ --enable-exportlib --with-export-includedir=${includedir} --with-export-libdir=${libdir} \ " -inherit autotools update-rc.d +inherit autotools-brokensep update-rc.d INITSCRIPT_NAME = "bind" INITSCRIPT_PARAMS = "defaults" diff --git a/meta/recipes-connectivity/bluez/bluez4.inc b/meta/recipes-connectivity/bluez/bluez4.inc index 73c2b75f6c..0827005074 100644 --- a/meta/recipes-connectivity/bluez/bluez4.inc +++ b/meta/recipes-connectivity/bluez/bluez4.inc @@ -24,7 +24,7 @@ SRC_URI = "\ " S = "${WORKDIR}/bluez-${PV}" -inherit autotools +inherit autotools-brokensep EXTRA_OECONF = "\ --disable-gstreamer \ diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index e08dff4ca5..2b832efa2c 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -19,7 +19,7 @@ SRC_URI = "\ " S = "${WORKDIR}/bluez-${PV}" -inherit autotools pkgconfig systemd +inherit autotools-brokensep pkgconfig systemd EXTRA_OECONF = "\ --enable-tools \ diff --git a/meta/recipes-connectivity/connman/connman-gnome_0.7.bb b/meta/recipes-connectivity/connman/connman-gnome_0.7.bb index f69d78c449..f121ea395e 100644 --- a/meta/recipes-connectivity/connman/connman-gnome_0.7.bb +++ b/meta/recipes-connectivity/connman/connman-gnome_0.7.bb @@ -18,7 +18,7 @@ SRC_URI = "git://github.com/connectivity/connman-gnome.git \ S = "${WORKDIR}/git" -inherit autotools gtk-icon-cache +inherit autotools-brokensep gtk-icon-cache RDEPENDS_${PN} = "connman" diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index 84d8d1d200..b3147c9dbc 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc @@ -66,7 +66,7 @@ SYSTEMD_SERVICE_${PN} = "connman.service" SYSTEMD_SERVICE_${PN}-vpn = "connman-vpn.service" SYSTEMD_WIRED_SETUP = "ExecStartPre=-${libdir}/connman/wired-setup" -inherit autotools pkgconfig systemd update-rc.d +inherit autotools-brokensep pkgconfig systemd update-rc.d do_configure_append () { sed -i "s#ExecStart=#${SYSTEMD_WIRED_SETUP}\nExecStart=#" ${S}/src/connman.service diff --git a/meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb b/meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb index 7f216ac704..7403dc95da 100644 --- a/meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb +++ b/meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb @@ -19,7 +19,7 @@ SRC_URI[sha256sum] = "61980551e46b2eaa9e17ad31cbc1a638074611fc33bff34163d10c7a67 export SYS_INCLUDES="-I${STAGING_INCDIR}" -inherit autotools update-rc.d +inherit autotools-brokensep update-rc.d INITSCRIPT_NAME = "irattach" INITSCRIPT_PARAMS = "defaults 20" diff --git a/meta/recipes-connectivity/neard/neard.inc b/meta/recipes-connectivity/neard/neard.inc index 7cccbdc9fb..1dde1da377 100644 --- a/meta/recipes-connectivity/neard/neard.inc +++ b/meta/recipes-connectivity/neard/neard.inc @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ file://src/near.h;beginline=1;endline=20;md5=358e4deefef251a4761e1ffacc965d13 \ " -inherit autotools pkgconfig systemd update-rc.d +inherit autotools-brokensep pkgconfig systemd update-rc.d EXTRA_OECONF += "--enable-tools" diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.9.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.9.bb index 45eacd970e..da371608d2 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.9.bb +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.9.bb @@ -44,7 +44,7 @@ INITSCRIPT_PARAMS = "defaults" INITSCRIPT_NAME_${PN}-client = "nfscommon" INITSCRIPT_PARAMS_${PN}-client = "defaults 19 21" -inherit autotools update-rc.d systemd +inherit autotools-brokensep update-rc.d systemd SYSTEMD_SERVICE_${PN} = "nfs-server.service nfs-mountd.service" SYSTEMD_SERVICE_${PN}-client = "nfs-statd.service" diff --git a/meta/recipes-connectivity/openssh/openssh_6.4p1.bb b/meta/recipes-connectivity/openssh/openssh_6.4p1.bb index b5e84d4838..236714de2d 100644 --- a/meta/recipes-connectivity/openssh/openssh_6.4p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_6.4p1.bb @@ -49,7 +49,7 @@ SYSTEMD_SERVICE_${PN}-sshd = "sshd.socket" PACKAGECONFIG ??= "tcp-wrappers" PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,,tcp-wrappers" -inherit autotools +inherit autotools-brokensep # LFS support: CFLAGS += "-D__FILE_OFFSET_BITS=64" diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.5.bb b/meta/recipes-connectivity/ppp/ppp_2.4.5.bb index 52bab4fc43..15ee3ff597 100644 --- a/meta/recipes-connectivity/ppp/ppp_2.4.5.bb +++ b/meta/recipes-connectivity/ppp/ppp_2.4.5.bb @@ -37,7 +37,7 @@ SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \ SRC_URI[md5sum] = "4621bc56167b6953ec4071043fe0ec57" SRC_URI[sha256sum] = "43317afec9299f9920b96f840414c977f0385410202d48e56d2fdb8230003505" -inherit autotools +inherit autotools-brokensep TARGET_CC_ARCH += " ${LDFLAGS}" EXTRA_OEMAKE = "STRIPPROG=${STRIP} MANDIR=${D}${datadir}/man/man8 INCDIR=${D}${includedir} LIBDIR=${D}${libdir}/pppd/${PV} BINDIR=${D}${sbindir}" diff --git a/meta/recipes-connectivity/telepathy/telepathy-mission-control_5.16.1.bb b/meta/recipes-connectivity/telepathy/telepathy-mission-control_5.16.1.bb index b242f1a67f..9ae68ddea9 100644 --- a/meta/recipes-connectivity/telepathy/telepathy-mission-control_5.16.1.bb +++ b/meta/recipes-connectivity/telepathy/telepathy-mission-control_5.16.1.bb @@ -12,7 +12,7 @@ SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-mission-control/$ SRC_URI[md5sum] = "421115a35b9e427807326877f86e7f43" SRC_URI[sha256sum] = "14ceb7d53535b43d44b8271ad11319d1d0fe6d193d154636b9e62b42799b9723" -inherit autotools pkgconfig pythonnative +inherit autotools-brokensep pkgconfig pythonnative PACKAGECONFIG ??= "" PACKAGECONFIG[upower] = "--enable-upower,--disable-upower,upower" diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index f76f68bbcb..1d5303fdb2 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc @@ -19,7 +19,7 @@ SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz file://cmake-2.8.11.2-FindFreetype.patch \ " -inherit autotools +inherit autotools-brokensep do_configure () { ./configure --prefix=${prefix} diff --git a/meta/recipes-devtools/expect/expect_5.45.bb b/meta/recipes-devtools/expect/expect_5.45.bb index ed55fa5e4b..037aaaa74c 100644 --- a/meta/recipes-devtools/expect/expect_5.45.bb +++ b/meta/recipes-devtools/expect/expect_5.45.bb @@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://license.terms;md5=fbf2de7e9102505b1439db06fc36ce5c" DEPENDS += "tcl" RDEPENDS_${PN} = "tcl" -inherit autotools +inherit autotools-brokensep SRC_URI = "${SOURCEFORGE_MIRROR}/expect/Expect/${PV}/${BPN}${PV}.tar.gz \ file://0001-configure.in.patch \ diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc index a0da027e42..5d02343e4b 100644 --- a/meta/recipes-devtools/git/git.inc +++ b/meta/recipes-devtools/git/git.inc @@ -13,7 +13,7 @@ EXTRA_OECONF = "--with-perl=${STAGING_BINDIR_NATIVE}/perl-native/perl \ --without-tcltk \ " -inherit autotools perlnative +inherit autotools-brokensep perlnative EXTRA_OEMAKE = "NO_PYTHON=1 RUNTIME_PREFIX=1" diff --git a/meta/recipes-devtools/icon-naming-utils/icon-naming-utils_0.8.90.bb b/meta/recipes-devtools/icon-naming-utils/icon-naming-utils_0.8.90.bb index 79d5a4e8a9..18e7fc0062 100644 --- a/meta/recipes-devtools/icon-naming-utils/icon-naming-utils_0.8.90.bb +++ b/meta/recipes-devtools/icon-naming-utils/icon-naming-utils_0.8.90.bb @@ -18,7 +18,7 @@ SRC_URI = "http://tango.freedesktop.org/releases/icon-naming-utils-${PV}.tar.gz" SRC_URI[md5sum] = "2c5c7a418e5eb3268f65e21993277fba" SRC_URI[sha256sum] = "044ab2199ed8c6a55ce36fd4fcd8b8021a5e21f5bab028c0a7cdcf52a5902e1c" -inherit autotools allarch perlnative +inherit autotools-brokensep allarch perlnative do_configure_append() { # Make sure we use our nativeperl wrapper. diff --git a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb index ea0ffcb921..fce4178ee1 100644 --- a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb +++ b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb @@ -17,7 +17,7 @@ SRC_URI[sha256sum] = "7103facee18a2ea97186ca459d743d22f7f89ad4b5cd1dfd1c34f83d6b FILESPATH = "${FILE_DIRNAME}/linuxdoc-tools-native/" -inherit autotools native +inherit autotools-brokensep native do_configure () { oe_runconf diff --git a/meta/recipes-devtools/mkelfimage/mkelfimage_git.bb b/meta/recipes-devtools/mkelfimage/mkelfimage_git.bb index baa8f4524e..bcf68a8e37 100644 --- a/meta/recipes-devtools/mkelfimage/mkelfimage_git.bb +++ b/meta/recipes-devtools/mkelfimage/mkelfimage_git.bb @@ -20,7 +20,7 @@ CFLAGS += "-fno-stack-protector" CACHED_CONFIGUREVARS += "HOST_CC='${BUILD_CC}'" EXTRA_OEMAKE += "HOST_CPPFLAGS='${BUILD_CPPFLAGS}'" -inherit autotools +inherit autotools-brokensep do_install_append() { rmdir ${D}${datadir}/mkelfImage/elf32-i386 diff --git a/meta/recipes-devtools/nasm/nasm_2.11.bb b/meta/recipes-devtools/nasm/nasm_2.11.bb index 859cd2188f..5f4b9533ba 100644 --- a/meta/recipes-devtools/nasm/nasm_2.11.bb +++ b/meta/recipes-devtools/nasm/nasm_2.11.bb @@ -9,7 +9,7 @@ SRC_URI = "http://www.nasm.us/pub/nasm/releasebuilds/${PV}/nasm-${PV}.tar.bz2 " SRC_URI[md5sum] = "4cd558047ea5ed51fc2c7c94e249c7b8" SRC_URI[sha256sum] = "1ce7e897c67255a195367a60c739a90a0b33a4a73f058f7cda3253bcf975642b" -inherit autotools +inherit autotools-brokensep do_configure_prepend () { if [ -f ${S}/aclocal.m4 ] && [ ! -f ${S}/acinclude.m4 ]; then diff --git a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb index 8af0b52640..9dbd442207 100644 --- a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb +++ b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb @@ -22,7 +22,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/openjade/openjade-${PV}.tar.gz \ SRC_URI[md5sum] = "7df692e3186109cc00db6825b777201e" SRC_URI[sha256sum] = "1d2d7996cc94f9b87d0c51cf0e028070ac177c4123ecbfd7ac1cb8d0b7d322d1" -inherit autotools native +inherit autotools-brokensep native EXTRA_OECONF = "--enable-spincludedir=${STAGING_INCDIR}/OpenSP \ --enable-splibdir=${STAGING_LIBDIR}" diff --git a/meta/recipes-devtools/python/python.inc b/meta/recipes-devtools/python/python.inc index 5a0766520c..90079a29c8 100644 --- a/meta/recipes-devtools/python/python.inc +++ b/meta/recipes-devtools/python/python.inc @@ -14,7 +14,7 @@ SRC_URI[sha256sum] = "726457e11cb153adc3f428aaf1901fc561a374c30e5e7da6742c0742a3 PYTHON_MAJMIN = "2.7" -inherit autotools +inherit autotools-brokensep PYTHONLSBOPTS = "--with-wctype-functions" PYTHONLSBOPTS_linuxstdbase = "ac_cv_sizeof_off_t=8" diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 76119c0bd4..138ba68646 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -9,7 +9,7 @@ RDEPENDS_${PN}_class-nativesdk = "nativesdk-libsdl" RDEPENDS_${PN}_class-target += "bash python" require qemu-targets.inc -inherit autotools +inherit autotools-brokensep BBCLASSEXTEND = "native nativesdk" # QEMU_TARGETS is overridable variable diff --git a/meta/recipes-devtools/quilt/quilt-0.61.inc b/meta/recipes-devtools/quilt/quilt-0.61.inc index 19966c8389..4d915bf3e4 100644 --- a/meta/recipes-devtools/quilt/quilt-0.61.inc +++ b/meta/recipes-devtools/quilt/quilt-0.61.inc @@ -13,7 +13,7 @@ SRC_URI = "http://download.savannah.gnu.org/releases/quilt/quilt-${PV}.tar.gz \ SRC_URI[md5sum] = "24417eba5961592b64103bdda001ebf4" SRC_URI[sha256sum] = "1eec0a270ac4d41eea0fd5823603c9d2a35ab6b8ab73a90dd92ce1291b2a9fc3" -inherit autotools ptest +inherit autotools-brokensep ptest EXTRA_OECONF_darwin += "--without-date \ |