summaryrefslogtreecommitdiff
path: root/recipes/util-linux-ng
diff options
context:
space:
mode:
authorHenning Heinold <heinold@inf.fu-berlin.de>2009-10-23 16:03:13 +0200
committerHenning Heinold <heinold@inf.fu-berlin.de>2009-10-23 16:04:37 +0200
commitde7bfd4382cfa58ac043d53804bc44d3fc41c8c4 (patch)
treeff344f759a7dbffc4c1065563ebe475dc2295d7a /recipes/util-linux-ng
parent4249269bf86f9dcf3e0437d1a1d460edaccaa667 (diff)
util-linux-ng: for chinook-compat let util-linux-ng compile with older libtool
*bump INC_PR
Diffstat (limited to 'recipes/util-linux-ng')
-rw-r--r--recipes/util-linux-ng/files/chinook_libtool.patch13
-rw-r--r--recipes/util-linux-ng/util-linux-ng.inc12
-rw-r--r--recipes/util-linux-ng/util-linux-ng_2.16.bb7
3 files changed, 24 insertions, 8 deletions
diff --git a/recipes/util-linux-ng/files/chinook_libtool.patch b/recipes/util-linux-ng/files/chinook_libtool.patch
new file mode 100644
index 0000000000..6ffdb77a4f
--- /dev/null
+++ b/recipes/util-linux-ng/files/chinook_libtool.patch
@@ -0,0 +1,13 @@
+Index: util-linux-ng-2.16/configure.ac
+===================================================================
+--- util-linux-ng-2.16.orig/configure.ac 2009-07-22 20:14:46.896898772 +0200
++++ util-linux-ng-2.16/configure.ac 2009-07-22 20:15:08.223644774 +0200
+@@ -70,7 +70,7 @@
+ AC_C_BIGENDIAN
+
+ dnl libtool-2
+-LT_INIT
++AM_PROG_LIBTOOL
+
+ PKG_PROG_PKG_CONFIG
+
diff --git a/recipes/util-linux-ng/util-linux-ng.inc b/recipes/util-linux-ng/util-linux-ng.inc
index 8a6bf30c22..8129c53e0d 100644
--- a/recipes/util-linux-ng/util-linux-ng.inc
+++ b/recipes/util-linux-ng/util-linux-ng.inc
@@ -8,13 +8,15 @@ AUTOTOOLS_STAGE_PKGCONFIG = "1"
DEFAULT_PREFERENCE = "-1"
-INC_PR = "r8"
+INC_PR = "r9"
# allows for a release candidate
RC ?= ""
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux-ng/v${PV}/util-linux-ng-${PV}${RC}.tar.bz2"
+SRC_URI_append_chinook-compat = " file://chinook_libtool.patch;patch=1 "
+
PACKAGES =+ "util-linux-ng-fdisk util-linux-ng-cfdisk util-linux-ng-sfdisk util-linux-ng-swaponoff util-linux-ng-losetup util-linux-ng-umount util-linux-ng-mount util-linux-ng-readprofile "
PACKAGES_DYNAMIC = "libblkid*"
@@ -58,6 +60,14 @@ EXTRA_OECONF = "--disable-use-tty-group --disable-makeinstall-chown \
S = "${WORKDIR}/util-linux-ng-${PV}${RC}"
+do_configure_prepend_chinook-compat () {
+
+ for i in lt~obsolete.m4 ltsugar.m4 libtool.m4 ltoptions.m4 ltversion.m4
+ do
+ rm ${S}/m4/${i}
+ done
+}
+
do_compile () {
set -e
# install ${WORKDIR}/MCONFIG ${S}/MCONFIG
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 e81ccca235..c677fba01d 100644
--- a/recipes/util-linux-ng/util-linux-ng_2.16.bb
+++ b/recipes/util-linux-ng/util-linux-ng_2.16.bb
@@ -12,10 +12,3 @@ EXTRA_OECONF += " --enable-libuuid --enable-libblkid \
LDFLAGS_append_libc-uclibc = " -lintl"
PACKAGES_DYNAMIC += "libuuid*"
-do_configure_prepend_chinook-compat () {
-
- for i in lt~obsolete.m4 ltsugar.m4 libtool.m4 ltoptions.m4 ltversion.m4
- do
- rm ${S}/m4/${i}
- done
-}