From b288eb5c2e5961caf57645b246143d3e2e596c55 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Wed, 21 May 2014 13:22:18 -0400 Subject: autotools: B != S build fixes Since oe-core introduced the autotools separated build and source directory changes, some package builds broke. With this change, we can build against the latest oe-core master. It should be noted that this masks the build issues, and the bbappends should be removed as dependency layers update or "real" fixes are generated. Signed-off-by: Bruce Ashfield --- meta-openstack/recipes-containers/lxc/lxc_1.0.1.bbappend | 1 + meta-openstack/recipes-devtools/erlang/erlang.inc | 2 +- meta-openstack/recipes-graphics/xorg-lib/libxaw_1.0.10.bbappend | 1 + .../recipes-support/bash-completion/bash-completion_2.1.bbappend | 1 + meta-openstack/recipes-support/cyrus-sasl/cyrus-sasl_2.1.26.bbappend | 1 + meta-openstack/recipes-support/fuse/fuse_2.9.3.bbappend | 1 + meta-openstack/recipes-support/libbsd/libbsd_0.6.0.bbappend | 1 + meta-openstack/recipes-support/memcached/memcached_1.4.17.bb | 2 +- meta-openstack/recipes-support/ntp/ntp_4.2.6p5.bbappend | 1 + meta-openstack/recipes-support/postgresql/postgresql_9.2.4.bbappend | 2 +- meta-openstack/recipes-support/xmlto/xmlto_0.0.25.bbappend | 1 + recipes-support/celt051/celt051_git.bb | 2 +- 12 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 meta-openstack/recipes-containers/lxc/lxc_1.0.1.bbappend create mode 100644 meta-openstack/recipes-graphics/xorg-lib/libxaw_1.0.10.bbappend create mode 100644 meta-openstack/recipes-support/bash-completion/bash-completion_2.1.bbappend create mode 100644 meta-openstack/recipes-support/cyrus-sasl/cyrus-sasl_2.1.26.bbappend create mode 100644 meta-openstack/recipes-support/fuse/fuse_2.9.3.bbappend create mode 100644 meta-openstack/recipes-support/libbsd/libbsd_0.6.0.bbappend create mode 100644 meta-openstack/recipes-support/ntp/ntp_4.2.6p5.bbappend create mode 100644 meta-openstack/recipes-support/xmlto/xmlto_0.0.25.bbappend diff --git a/meta-openstack/recipes-containers/lxc/lxc_1.0.1.bbappend b/meta-openstack/recipes-containers/lxc/lxc_1.0.1.bbappend new file mode 100644 index 0000000..7447c56 --- /dev/null +++ b/meta-openstack/recipes-containers/lxc/lxc_1.0.1.bbappend @@ -0,0 +1 @@ +inherit autotools-brokensep diff --git a/meta-openstack/recipes-devtools/erlang/erlang.inc b/meta-openstack/recipes-devtools/erlang/erlang.inc index 32ee135..8dd2478 100644 --- a/meta-openstack/recipes-devtools/erlang/erlang.inc +++ b/meta-openstack/recipes-devtools/erlang/erlang.inc @@ -15,4 +15,4 @@ S = "${WORKDIR}/otp_src_${UPSTREAM_VERSION}" PARALLEL_MAKE = "" -inherit autotools +inherit autotools autotools-brokensep diff --git a/meta-openstack/recipes-graphics/xorg-lib/libxaw_1.0.10.bbappend b/meta-openstack/recipes-graphics/xorg-lib/libxaw_1.0.10.bbappend new file mode 100644 index 0000000..7447c56 --- /dev/null +++ b/meta-openstack/recipes-graphics/xorg-lib/libxaw_1.0.10.bbappend @@ -0,0 +1 @@ +inherit autotools-brokensep diff --git a/meta-openstack/recipes-support/bash-completion/bash-completion_2.1.bbappend b/meta-openstack/recipes-support/bash-completion/bash-completion_2.1.bbappend new file mode 100644 index 0000000..7447c56 --- /dev/null +++ b/meta-openstack/recipes-support/bash-completion/bash-completion_2.1.bbappend @@ -0,0 +1 @@ +inherit autotools-brokensep diff --git a/meta-openstack/recipes-support/cyrus-sasl/cyrus-sasl_2.1.26.bbappend b/meta-openstack/recipes-support/cyrus-sasl/cyrus-sasl_2.1.26.bbappend new file mode 100644 index 0000000..7447c56 --- /dev/null +++ b/meta-openstack/recipes-support/cyrus-sasl/cyrus-sasl_2.1.26.bbappend @@ -0,0 +1 @@ +inherit autotools-brokensep diff --git a/meta-openstack/recipes-support/fuse/fuse_2.9.3.bbappend b/meta-openstack/recipes-support/fuse/fuse_2.9.3.bbappend new file mode 100644 index 0000000..7447c56 --- /dev/null +++ b/meta-openstack/recipes-support/fuse/fuse_2.9.3.bbappend @@ -0,0 +1 @@ +inherit autotools-brokensep diff --git a/meta-openstack/recipes-support/libbsd/libbsd_0.6.0.bbappend b/meta-openstack/recipes-support/libbsd/libbsd_0.6.0.bbappend new file mode 100644 index 0000000..7447c56 --- /dev/null +++ b/meta-openstack/recipes-support/libbsd/libbsd_0.6.0.bbappend @@ -0,0 +1 @@ +inherit autotools-brokensep diff --git a/meta-openstack/recipes-support/memcached/memcached_1.4.17.bb b/meta-openstack/recipes-support/memcached/memcached_1.4.17.bb index 07d5183..43c826f 100644 --- a/meta-openstack/recipes-support/memcached/memcached_1.4.17.bb +++ b/meta-openstack/recipes-support/memcached/memcached_1.4.17.bb @@ -19,7 +19,7 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=7e5ded7363d335e1bb18013ca08046ff" -inherit autotools +inherit autotools autotools-brokensep DEPENDS += "libevent" RDEPENDS_${PN} += "perl perl-module-posix perl-module-autoloader perl-module-tie-hash" diff --git a/meta-openstack/recipes-support/ntp/ntp_4.2.6p5.bbappend b/meta-openstack/recipes-support/ntp/ntp_4.2.6p5.bbappend new file mode 100644 index 0000000..7447c56 --- /dev/null +++ b/meta-openstack/recipes-support/ntp/ntp_4.2.6p5.bbappend @@ -0,0 +1 @@ +inherit autotools-brokensep diff --git a/meta-openstack/recipes-support/postgresql/postgresql_9.2.4.bbappend b/meta-openstack/recipes-support/postgresql/postgresql_9.2.4.bbappend index 66a12fa..d2dbd91 100644 --- a/meta-openstack/recipes-support/postgresql/postgresql_9.2.4.bbappend +++ b/meta-openstack/recipes-support/postgresql/postgresql_9.2.4.bbappend @@ -4,7 +4,7 @@ PRINC := "${@int(PRINC) + 1}" SRC_URI += "file://postgresql \ file://postgresql-init" -inherit useradd update-rc.d identity hosts +inherit useradd update-rc.d identity hosts autotools-brokensep # default DB_DATADIR ?= "/var/lib/postgres/data" diff --git a/meta-openstack/recipes-support/xmlto/xmlto_0.0.25.bbappend b/meta-openstack/recipes-support/xmlto/xmlto_0.0.25.bbappend new file mode 100644 index 0000000..7447c56 --- /dev/null +++ b/meta-openstack/recipes-support/xmlto/xmlto_0.0.25.bbappend @@ -0,0 +1 @@ +inherit autotools-brokensep diff --git a/recipes-support/celt051/celt051_git.bb b/recipes-support/celt051/celt051_git.bb index 93a2405..686c962 100644 --- a/recipes-support/celt051/celt051_git.bb +++ b/recipes-support/celt051/celt051_git.bb @@ -23,7 +23,7 @@ S = "${WORKDIR}/git" DEPENDS += "libogg" -inherit pkgconfig autotools +inherit pkgconfig autotools-brokensep PACKAGECONFIG = "" -- cgit v1.2.3-54-g00ecf