diff options
| author |   Koen Kooi <koen@openembedded.org> | 2010-01-24 12:02:56 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2010-01-24 12:02:56 +0100 |
| commit | 39c8510abf3929e58d4f9fe7c0a6561d64938397 (patch) | |
| tree | d6a7832f830dcedc4137759d57394ae984606771 | |
| parent | 8e47969136953d6aa5dd040ba19a6fabafe6ba75 (diff) | |
| download | openembedded-39c8510abf3929e58d4f9fe7c0a6561d64938397.tar.gz | |
e2fsprogs-libs, util-linux-ng: sort out libblkid move some more
* we're using libblkid from u-l-ng nowadays, but e-l was still install a .pc breaking apps checking for libblkid > 2.15
| -rw-r--r-- | recipes/e2fsprogs-libs/e2fsprogs-libs.inc | 2 | ||||
| -rw-r--r-- | recipes/e2fsprogs-libs/e2fsprogs-libs_1.41.8.bb | 2 | ||||
| -rw-r--r-- | recipes/util-linux-ng/util-linux-ng.inc | 3 | ||||
| -rw-r--r-- | recipes/util-linux-ng/util-linux-ng_2.16.bb | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/recipes/e2fsprogs-libs/e2fsprogs-libs.inc b/recipes/e2fsprogs-libs/e2fsprogs-libs.inc index f5e974b8aa..35b93db2cd 100644 --- a/recipes/e2fsprogs-libs/e2fsprogs-libs.inc +++ b/recipes/e2fsprogs-libs/e2fsprogs-libs.inc @@ -4,7 +4,7 @@ SECTION = "base" PRIORITY = "optional" DEPENDS = "util-linux-ng" -inherit autotools_stage gettext pkgconfig +inherit autotools_stage gettext SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \ file://configure.patch;patch=1 \ diff --git a/recipes/e2fsprogs-libs/e2fsprogs-libs_1.41.8.bb b/recipes/e2fsprogs-libs/e2fsprogs-libs_1.41.8.bb index 1eca5f35f0..086492c5f8 100644 --- a/recipes/e2fsprogs-libs/e2fsprogs-libs_1.41.8.bb +++ b/recipes/e2fsprogs-libs/e2fsprogs-libs_1.41.8.bb @@ -2,6 +2,8 @@ require e2fsprogs-libs.inc SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \ " +PR = "r1" + EXTRA_OECONF += " --enable-elf-shlibs " do_configure() { diff --git a/recipes/util-linux-ng/util-linux-ng.inc b/recipes/util-linux-ng/util-linux-ng.inc index 8129c53e0d..7f4333ba9d 100644 --- a/recipes/util-linux-ng/util-linux-ng.inc +++ b/recipes/util-linux-ng/util-linux-ng.inc @@ -3,8 +3,7 @@ SECTION = "base" LICENSE = "GPL" DEPENDS = "udev zlib ncurses virtual/libintl" -inherit autotools_stage -AUTOTOOLS_STAGE_PKGCONFIG = "1" +inherit autotools DEFAULT_PREFERENCE = "-1" diff --git a/recipes/util-linux-ng/util-linux-ng_2.16.bb b/recipes/util-linux-ng/util-linux-ng_2.16.bb index c677fba01d..bbcc9cef4f 100644 --- a/recipes/util-linux-ng/util-linux-ng_2.16.bb +++ b/recipes/util-linux-ng/util-linux-ng_2.16.bb @@ -1,6 +1,6 @@ require util-linux-ng.inc -PR = "${INC_PR}.3" +PR = "${INC_PR}.4" SRC_URI += "file://uclibc-compile.patch;patch=1 \ file://tls.patch;patch=1 \ |