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:01:16 +0000 |
| commit | 069de520ec864fc78084e8f1ddfb20edaab55f5e (patch) | |
| tree | c0fa4c29433385bfa72dbcef6c6a7b3d94362651 /meta/recipes-support | |
| parent | 5436de527486e1176d755d48f4424c02530bd0ca (diff) | |
| download | poky-069de520ec864fc78084e8f1ddfb20edaab55f5e.tar.gz | |
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.
(From OE-Core rev: 006b8a7808a58713af16c326dc37d07765334b12)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
| -rw-r--r-- | meta/recipes-support/apr/apr-util_1.5.2.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-support/apr/apr_1.4.8.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-support/aspell/aspell_0.60.6.1.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-support/attr/ea-acl.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2014.1.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-support/gnutls/gnutls.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-support/js/js_1.7.0+1.8.0rc1.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-support/libcroco/libcroco_0.6.8.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-support/libfm/libfm_1.1.2.2.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-support/libgcrypt/libgcrypt.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-support/libnl/libnl_3.2.22.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-support/nspr/nspr_4.10.3.bb | 2 |
12 files changed, 12 insertions, 12 deletions
diff --git a/meta/recipes-support/apr/apr-util_1.5.2.bb b/meta/recipes-support/apr/apr-util_1.5.2.bb index 65f26b3c32..4546b9791b 100644 --- a/meta/recipes-support/apr/apr-util_1.5.2.bb +++ b/meta/recipes-support/apr/apr-util_1.5.2.bb | |||
| @@ -28,7 +28,7 @@ EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ | |||
| 28 | --with-expat=${STAGING_DIR_HOST}${prefix}" | 28 | --with-expat=${STAGING_DIR_HOST}${prefix}" |
| 29 | 29 | ||
| 30 | 30 | ||
| 31 | inherit autotools lib_package binconfig | 31 | inherit autotools-brokensep lib_package binconfig |
| 32 | 32 | ||
| 33 | OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" | 33 | OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" |
| 34 | 34 | ||
diff --git a/meta/recipes-support/apr/apr_1.4.8.bb b/meta/recipes-support/apr/apr_1.4.8.bb index 4af2a6b0c7..4d36585a3e 100644 --- a/meta/recipes-support/apr/apr_1.4.8.bb +++ b/meta/recipes-support/apr/apr_1.4.8.bb | |||
| @@ -19,7 +19,7 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ | |||
| 19 | SRC_URI[md5sum] = "ce2ab01a0c3cdb71cf0a6326b8654f41" | 19 | SRC_URI[md5sum] = "ce2ab01a0c3cdb71cf0a6326b8654f41" |
| 20 | SRC_URI[sha256sum] = "61b8d2f8d321c6365ee3d71d0bb41f3a89c44da6124cc5b407a3b8319d660421" | 20 | SRC_URI[sha256sum] = "61b8d2f8d321c6365ee3d71d0bb41f3a89c44da6124cc5b407a3b8319d660421" |
| 21 | 21 | ||
| 22 | inherit autotools lib_package binconfig multilib_header ptest | 22 | inherit autotools-brokensep lib_package binconfig multilib_header ptest |
| 23 | 23 | ||
| 24 | OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" | 24 | OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" |
| 25 | 25 | ||
diff --git a/meta/recipes-support/aspell/aspell_0.60.6.1.bb b/meta/recipes-support/aspell/aspell_0.60.6.1.bb index 86fcc93fca..8ac8809a06 100644 --- a/meta/recipes-support/aspell/aspell_0.60.6.1.bb +++ b/meta/recipes-support/aspell/aspell_0.60.6.1.bb | |||
| @@ -23,4 +23,4 @@ FILES_libpspell = "${libdir}/libpspell.so.*" | |||
| 23 | FILES_libpspell-dev = "${libdir}/libpspell* ${bindir}/pspell-config ${includedir}/pspell" | 23 | FILES_libpspell-dev = "${libdir}/libpspell* ${bindir}/pspell-config ${includedir}/pspell" |
| 24 | 24 | ||
| 25 | ARM_INSTRUCTION_SET = "arm" | 25 | ARM_INSTRUCTION_SET = "arm" |
| 26 | inherit autotools gettext | 26 | inherit autotools-brokensep gettext |
diff --git a/meta/recipes-support/attr/ea-acl.inc b/meta/recipes-support/attr/ea-acl.inc index bcc7acc745..785ce0cf50 100644 --- a/meta/recipes-support/attr/ea-acl.inc +++ b/meta/recipes-support/attr/ea-acl.inc | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | SRC_URI += "file://relative-libdir.patch;striplevel=0 \ | 3 | SRC_URI += "file://relative-libdir.patch;striplevel=0 \ |
| 4 | " | 4 | " |
| 5 | 5 | ||
| 6 | inherit autotools gettext | 6 | inherit autotools-brokensep gettext |
| 7 | 7 | ||
| 8 | # the package comes with a custom config.h.in, it cannot be | 8 | # the package comes with a custom config.h.in, it cannot be |
| 9 | # overwritten by autoheader | 9 | # overwritten by autoheader |
diff --git a/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2014.1.bb b/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2014.1.bb index 30ca808134..146a02ac7d 100644 --- a/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2014.1.bb +++ b/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2014.1.bb | |||
| @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ | |||
| 11 | 11 | ||
| 12 | DEPENDS = "glib-2.0" | 12 | DEPENDS = "glib-2.0" |
| 13 | 13 | ||
| 14 | inherit autotools pkgconfig | 14 | inherit autotools-brokensep pkgconfig |
| 15 | 15 | ||
| 16 | PACKAGECONFIG ??= "" | 16 | PACKAGECONFIG ??= "" |
| 17 | PACKAGECONFIG[journald] = "--with-systemd-journal,--without-systemd-journal,systemd,systemd" | 17 | PACKAGECONFIG[journald] = "--with-systemd-journal,--without-systemd-journal,systemd,systemd" |
diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc index 18c91eb8cc..39aaec18b5 100644 --- a/meta/recipes-support/gnutls/gnutls.inc +++ b/meta/recipes-support/gnutls/gnutls.inc | |||
| @@ -19,7 +19,7 @@ SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1] | |||
| 19 | 19 | ||
| 20 | SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.bz2" | 20 | SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.bz2" |
| 21 | 21 | ||
| 22 | inherit autotools binconfig pkgconfig gettext lib_package | 22 | inherit autotools-brokensep binconfig pkgconfig gettext lib_package |
| 23 | 23 | ||
| 24 | EXTRA_OECONF="--with-included-opencdk --with-included-libcfg --disable-rpath \ | 24 | EXTRA_OECONF="--with-included-opencdk --with-included-libcfg --disable-rpath \ |
| 25 | --with-libtasn1-prefix=${STAGING_DIR_HOST}${prefix} \ | 25 | --with-libtasn1-prefix=${STAGING_DIR_HOST}${prefix} \ |
diff --git a/meta/recipes-support/js/js_1.7.0+1.8.0rc1.bb b/meta/recipes-support/js/js_1.7.0+1.8.0rc1.bb index 78da0bd3f3..e32050446c 100644 --- a/meta/recipes-support/js/js_1.7.0+1.8.0rc1.bb +++ b/meta/recipes-support/js/js_1.7.0+1.8.0rc1.bb | |||
| @@ -21,7 +21,7 @@ S = "${WORKDIR}/js/src" | |||
| 21 | 21 | ||
| 22 | # use local autoconf script to generate a usable jsautocfg.h | 22 | # use local autoconf script to generate a usable jsautocfg.h |
| 23 | # don't bother with automake | 23 | # don't bother with automake |
| 24 | inherit autotools | 24 | inherit autotools-brokensep |
| 25 | 25 | ||
| 26 | do_configure_prepend() { | 26 | do_configure_prepend() { |
| 27 | cp -f ${WORKDIR}/configure.ac ${S} | 27 | cp -f ${WORKDIR}/configure.ac ${S} |
diff --git a/meta/recipes-support/libcroco/libcroco_0.6.8.bb b/meta/recipes-support/libcroco/libcroco_0.6.8.bb index 61cd8182f6..385665f0fd 100644 --- a/meta/recipes-support/libcroco/libcroco_0.6.8.bb +++ b/meta/recipes-support/libcroco/libcroco_0.6.8.bb | |||
| @@ -13,7 +13,7 @@ BBCLASSEXTEND = "native" | |||
| 13 | EXTRA_OECONF += "--enable-Bsymbolic=auto" | 13 | EXTRA_OECONF += "--enable-Bsymbolic=auto" |
| 14 | PR = "r1" | 14 | PR = "r1" |
| 15 | 15 | ||
| 16 | inherit autotools pkgconfig gnomebase | 16 | inherit autotools-brokensep pkgconfig gnomebase |
| 17 | 17 | ||
| 18 | GNOME_COMPRESS_TYPE = "xz" | 18 | GNOME_COMPRESS_TYPE = "xz" |
| 19 | 19 | ||
diff --git a/meta/recipes-support/libfm/libfm_1.1.2.2.bb b/meta/recipes-support/libfm/libfm_1.1.2.2.bb index 581ab8c753..ea6323a831 100644 --- a/meta/recipes-support/libfm/libfm_1.1.2.2.bb +++ b/meta/recipes-support/libfm/libfm_1.1.2.2.bb | |||
| @@ -17,7 +17,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.gz \ | |||
| 17 | SRC_URI[md5sum] = "ea3d09b23ef4c37cb84ae57ea16b8f08" | 17 | SRC_URI[md5sum] = "ea3d09b23ef4c37cb84ae57ea16b8f08" |
| 18 | SRC_URI[sha256sum] = "158e2b6974350d2dab15932b496bb4d448553e60bbf7cdfe4d6e9bd99d19d682" | 18 | SRC_URI[sha256sum] = "158e2b6974350d2dab15932b496bb4d448553e60bbf7cdfe4d6e9bd99d19d682" |
| 19 | 19 | ||
| 20 | inherit autotools pkgconfig | 20 | inherit autotools-brokensep pkgconfig |
| 21 | 21 | ||
| 22 | PACKAGES += "${PN}-mime" | 22 | PACKAGES += "${PN}-mime" |
| 23 | FILES_${PN}-mime = "${datadir}/mime/" | 23 | FILES_${PN}-mime = "${datadir}/mime/" |
diff --git a/meta/recipes-support/libgcrypt/libgcrypt.inc b/meta/recipes-support/libgcrypt/libgcrypt.inc index 249939dab9..e7fcc62908 100644 --- a/meta/recipes-support/libgcrypt/libgcrypt.inc +++ b/meta/recipes-support/libgcrypt/libgcrypt.inc | |||
| @@ -14,7 +14,7 @@ SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz \ | |||
| 14 | file://add-pkgconfig-support.patch \ | 14 | file://add-pkgconfig-support.patch \ |
| 15 | file://libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch" | 15 | file://libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch" |
| 16 | 16 | ||
| 17 | inherit autotools binconfig pkgconfig | 17 | inherit autotools-brokensep binconfig pkgconfig |
| 18 | 18 | ||
| 19 | EXTRA_OECONF = "--disable-asm --with-capabilities" | 19 | EXTRA_OECONF = "--disable-asm --with-capabilities" |
| 20 | 20 | ||
diff --git a/meta/recipes-support/libnl/libnl_3.2.22.bb b/meta/recipes-support/libnl/libnl_3.2.22.bb index 73b10c5b66..a299bfbe7b 100644 --- a/meta/recipes-support/libnl/libnl_3.2.22.bb +++ b/meta/recipes-support/libnl/libnl_3.2.22.bb | |||
| @@ -19,7 +19,7 @@ SRC_URI = "http://www.infradead.org/~tgr/${BPN}/files/${BP}.tar.gz \ | |||
| 19 | SRC_URI[md5sum] = "2e1c889494d274aca24ce5f6a748e66e" | 19 | SRC_URI[md5sum] = "2e1c889494d274aca24ce5f6a748e66e" |
| 20 | SRC_URI[sha256sum] = "c7c5f267dfeae0c1a530bf96b71fb7c8dbbb07d54beef49b6712d8d6166f629b" | 20 | SRC_URI[sha256sum] = "c7c5f267dfeae0c1a530bf96b71fb7c8dbbb07d54beef49b6712d8d6166f629b" |
| 21 | 21 | ||
| 22 | inherit autotools pkgconfig | 22 | inherit autotools-brokensep pkgconfig |
| 23 | 23 | ||
| 24 | FILES_${PN} = "${libdir}/libnl-3.so.* \ | 24 | FILES_${PN} = "${libdir}/libnl-3.so.* \ |
| 25 | ${libdir}/libnl.so.* \ | 25 | ${libdir}/libnl.so.* \ |
diff --git a/meta/recipes-support/nspr/nspr_4.10.3.bb b/meta/recipes-support/nspr/nspr_4.10.3.bb index 4792b6543b..0adfe3b3a3 100644 --- a/meta/recipes-support/nspr/nspr_4.10.3.bb +++ b/meta/recipes-support/nspr/nspr_4.10.3.bb | |||
| @@ -138,7 +138,7 @@ TESTS = "runtests.pl \ | |||
| 138 | xnotify \ | 138 | xnotify \ |
| 139 | zerolen" | 139 | zerolen" |
| 140 | 140 | ||
| 141 | inherit autotools | 141 | inherit autotools-brokensep |
| 142 | 142 | ||
| 143 | do_configure() { | 143 | do_configure() { |
| 144 | gnu-configize --force | 144 | gnu-configize --force |
