[oe] [PATCH v2] inherit lib_package before binconfig

Andreas Oberritter obi at opendreambox.org
Sun Oct 17 13:29:09 UTC 2010 

* binconfig modifies FILES_${PN}-dev, but lib_package assigns this
  variable. Therefore, lib_package must be inherited before binconfig.
* v2: bump PRs

Signed-off-by: Andreas Oberritter <obi at opendreambox.org>
---
 recipes/confuse/confuse_2.7.bb        |    3 ++-
 recipes/fltk/fltk_1.1.4.bb            |    4 ++--
 recipes/gutenprint/ijs_0.35.bb        |    3 ++-
 recipes/libgcrypt/libgcrypt.inc       |    3 ++-
 recipes/libgcrypt/libgcrypt_1.2.4.bb  |    2 +-
 recipes/libgcrypt/libgcrypt_1.4.0.bb  |    2 +-
 recipes/libgcrypt/libgcrypt_1.4.1.bb  |    1 +
 recipes/libusb/libusb-compat_0.1.2.bb |    4 ++--
 recipes/libusb/libusb-compat_0.1.3.bb |    4 ++--
 recipes/libusb/libusb_0.1.12.bb       |    4 ++--
 recipes/neon/neon_0.25.5.bb           |    4 ++--
 recipes/neon/neon_0.29.3.bb           |    4 ++--
 12 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/recipes/confuse/confuse_2.7.bb b/recipes/confuse/confuse_2.7.bb
index 3bb57eb..8cf837a 100644
--- a/recipes/confuse/confuse_2.7.bb
+++ b/recipes/confuse/confuse_2.7.bb
@@ -2,10 +2,11 @@ DESCRIPTION = "Library for parsing configuration files."
 HOMEPAGE = "http://www.nongnu.org/confuse/"
 LICENSE = "LGPL"
 SECTION = "libs"
+PR = "r1"
 
 SRC_URI = "http://download.savannah.gnu.org/releases/confuse/confuse-${PV}.tar.gz \
 	  "
-inherit autotools binconfig pkgconfig lib_package
+inherit autotools lib_package binconfig pkgconfig
 
 EXTRA_OECONF = "--enable-shared"
 
diff --git a/recipes/fltk/fltk_1.1.4.bb b/recipes/fltk/fltk_1.1.4.bb
index e9927d6..c48d6e2 100644
--- a/recipes/fltk/fltk_1.1.4.bb
+++ b/recipes/fltk/fltk_1.1.4.bb
@@ -4,13 +4,13 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "jpeg libpng virtual/libgl zlib"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "ftp://ftp-fourier.ujf-grenoble.fr/xcas/devel/sources/fltk-${PV}-device.tar.gz"
 
 S = "${WORKDIR}/fltk-${PV}-Fl_Device"
 
-inherit autotools binconfig lib_package
+inherit autotools lib_package binconfig
 
 CXXFLAGS = ""
 
diff --git a/recipes/gutenprint/ijs_0.35.bb b/recipes/gutenprint/ijs_0.35.bb
index f6aec3b..948dd94 100644
--- a/recipes/gutenprint/ijs_0.35.bb
+++ b/recipes/gutenprint/ijs_0.35.bb
@@ -1,10 +1,11 @@
 DESCRIPTION = "Inkjet driver from linuxprinting.org"
 LICENSE = "MIT"
 HOMEPAGE = "http://www.linuxprinting.org/ijs/"
+PR = "r1"
 
 SRC_URI = "http://www.linuxprinting.org/ijs/download/ijs-${PV}.tar.bz2"
 
-inherit autotools pkgconfig binconfig lib_package
+inherit autotools lib_package pkgconfig binconfig
 
 EXTRA_OECONF = " --enable-shared "
 
diff --git a/recipes/libgcrypt/libgcrypt.inc b/recipes/libgcrypt/libgcrypt.inc
index f29dc8d..2a01e04 100644
--- a/recipes/libgcrypt/libgcrypt.inc
+++ b/recipes/libgcrypt/libgcrypt.inc
@@ -3,12 +3,13 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL LGPL FDL"
 DEPENDS = "libgpg-error"
+INC_PR = "r4"
 
 SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz \
            file://add-pkgconfig-support.patch \
            file://mips-h-constraint.patch"
 
-inherit autotools binconfig pkgconfig lib_package
+inherit autotools lib_package binconfig pkgconfig
 
 EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities"
 
diff --git a/recipes/libgcrypt/libgcrypt_1.2.4.bb b/recipes/libgcrypt/libgcrypt_1.2.4.bb
index 2241e65..3db5486 100644
--- a/recipes/libgcrypt/libgcrypt_1.2.4.bb
+++ b/recipes/libgcrypt/libgcrypt_1.2.4.bb
@@ -1,6 +1,6 @@
 require libgcrypt.inc
 
-PR = "r2"
+PR = "${INC_PR}.0"
 
 SRC_URI[md5sum] = "be20ee47778ff90703afd58c090f07b9"
 SRC_URI[sha256sum] = "cf3c3f313ebeb9165d80439beaeb7f621b73856a2159e4b84c70f32b455fd9ec"
diff --git a/recipes/libgcrypt/libgcrypt_1.4.0.bb b/recipes/libgcrypt/libgcrypt_1.4.0.bb
index efd48d8..b71e10b 100644
--- a/recipes/libgcrypt/libgcrypt_1.4.0.bb
+++ b/recipes/libgcrypt/libgcrypt_1.4.0.bb
@@ -1,6 +1,6 @@
 require libgcrypt.inc
 
-PR = "r3"
+PR = "${INC_PR}.0"
 
 SRC_URI[md5sum] = "4f80e46b38a71767479a3d953af22bdd"
 SRC_URI[sha256sum] = "14d457c3ed1d4751664f7196cbcd20e7db82532025f35634812f0cb7470fc43e"
diff --git a/recipes/libgcrypt/libgcrypt_1.4.1.bb b/recipes/libgcrypt/libgcrypt_1.4.1.bb
index bb7457d..64e14a4 100644
--- a/recipes/libgcrypt/libgcrypt_1.4.1.bb
+++ b/recipes/libgcrypt/libgcrypt_1.4.1.bb
@@ -1,5 +1,6 @@
 require libgcrypt.inc
 
+PR = "${INC_PR}.0"
 
 SRC_URI[md5sum] = "555488ddfc81a6e0df1fb5112e7eee13"
 SRC_URI[sha256sum] = "7562042a6210947363bd6a9bbcdd03f8d02470c0347970b507f689d25a907844"
diff --git a/recipes/libusb/libusb-compat_0.1.2.bb b/recipes/libusb/libusb-compat_0.1.2.bb
index 8283251..19f5709 100644
--- a/recipes/libusb/libusb-compat_0.1.2.bb
+++ b/recipes/libusb/libusb-compat_0.1.2.bb
@@ -4,14 +4,14 @@ SECTION = "libs"
 LICENSE = "LGPLv2.1"
 PROVIDES = "virtual/libusb0"
 PE = "1"
-PR = "r0"
+PR = "r1"
 
 DEPENDS = "libusb1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/${P}.tar.bz2"
 SRC_URI_append_nylon = " file://gcc-3-compatibility.patch"
 
-inherit autotools binconfig lib_package
+inherit autotools lib_package binconfig
 
 AUTOTOOLS_STAGE_PKGCONFIG = "1"
 EXTRA_OECONF = "--disable-build-docs"
diff --git a/recipes/libusb/libusb-compat_0.1.3.bb b/recipes/libusb/libusb-compat_0.1.3.bb
index 0237ff4..ed30b51 100644
--- a/recipes/libusb/libusb-compat_0.1.3.bb
+++ b/recipes/libusb/libusb-compat_0.1.3.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
 LICENSE = "LGPLv2.1"
 PROVIDES = "virtual/libusb0"
 PE = "1"
-PR = "r0"
+PR = "r1"
 
 DEPENDS = "libusb1"
 
@@ -14,7 +14,7 @@ SRC_URI[libusbcompat013tarbz2.sha256sum] = "a590a03b6188030ee1ca1a0af55685fcde00
 
 SRC_URI_append_nylon = " file://gcc-3-compatibility.patch"
 
-inherit autotools binconfig lib_package
+inherit autotools lib_package binconfig
 
 AUTOTOOLS_STAGE_PKGCONFIG = "1"
 EXTRA_OECONF = "--disable-build-docs"
diff --git a/recipes/libusb/libusb_0.1.12.bb b/recipes/libusb/libusb_0.1.12.bb
index 0f224a6..8ea926b 100644
--- a/recipes/libusb/libusb_0.1.12.bb
+++ b/recipes/libusb/libusb_0.1.12.bb
@@ -3,14 +3,14 @@ HOMEPAGE = "http://libusb.sf.net"
 SECTION = "libs"
 LICENSE = "LGPLv2.1"
 PROVIDES = "virtual/libusb0"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.gz \
 	   file://configure_fix.patch"
 
 S = "${WORKDIR}/libusb-${PV}"
 
-inherit autotools pkgconfig binconfig lib_package
+inherit autotools lib_package pkgconfig binconfig
 
 PARALLEL_MAKE = ""
 EXTRA_OECONF = "--disable-build-docs"
diff --git a/recipes/neon/neon_0.25.5.bb b/recipes/neon/neon_0.25.5.bb
index e67132f..971a71d 100644
--- a/recipes/neon/neon_0.25.5.bb
+++ b/recipes/neon/neon_0.25.5.bb
@@ -4,13 +4,13 @@ SECTION = "libs"
 LICENSE = "LGPL"
 DEPENDS = "zlib libxml2 expat time gnutls"
 
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "http://www.webdav.org/${PN}/${P}.tar.gz \
            file://gnutls-force-and-detect.patch \
            file://gnutls-2.patch"
 
-inherit autotools binconfig lib_package pkgconfig
+inherit autotools lib_package binconfig pkgconfig
 
 EXTRA_OECONF = "--with-ssl=gnutls --with-libxml2 --with-expat --enable-shared --without-gssapi"
 EXTRA_AUTORECONF=" -I ${S}/macros "
diff --git a/recipes/neon/neon_0.29.3.bb b/recipes/neon/neon_0.29.3.bb
index e182d55..e69bff7 100644
--- a/recipes/neon/neon_0.29.3.bb
+++ b/recipes/neon/neon_0.29.3.bb
@@ -2,13 +2,13 @@ DESCRIPTION = "neon is an HTTP and WebDAV client library, with a C interface."
 SECTION = "libs"
 LICENSE = "LGPL"
 DEPENDS = "zlib libxml2 expat time gnutls"
-PR = "r2"
+PR = "r3"
 
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "http://www.webdav.org/${PN}/${P}.tar.gz"
 
-inherit autotools binconfig lib_package pkgconfig
+inherit autotools lib_package binconfig pkgconfig
 
 EXTRA_OECONF = "--with-ssl=gnutls --with-libxml2 --with-expat --enable-shared"
 EXTRA_AUTORECONF=" -I ${S}/macros "
-- 
1.7.1

More information about the Openembedded-devel mailing list