diff options
| author | Gustavo Zacarias <gustavo@zacarias.com.ar> | 2014-06-30 10:16:18 -0300 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-06-30 23:34:49 +0200 |
| commit | ea7061f40e04f6a475705a579529978de1b9cc91 (patch) | |
| tree | e6f8dd2e359e249a6987173af91e59825a62a541 | |
| parent | b8823078671edfab1ef458c0f53cd16f4edf93b1 (diff) | |
| download | buildroot-ea7061f40e04f6a475705a579529978de1b9cc91.tar.gz buildroot-ea7061f40e04f6a475705a579529978de1b9cc91.zip | |
parted: fix nommu build
Add patch to accept uclinux in the tuple, and also disable dynamic libs
for static scenarios. Fixes:
http://autobuild.buildroot.net/results/d9a/d9a9baf0c1bfdb7f7d03ebed084a80ef3001c86d/
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
| -rw-r--r-- | package/parted/parted-002-configure.ac-uclinux-is-also-linux.patch | 33 | ||||
| -rw-r--r-- | package/parted/parted.mk | 6 |
2 files changed, 39 insertions, 0 deletions
diff --git a/package/parted/parted-002-configure.ac-uclinux-is-also-linux.patch b/package/parted/parted-002-configure.ac-uclinux-is-also-linux.patch new file mode 100644 index 0000000000..b2119bcdd7 --- /dev/null +++ b/package/parted/parted-002-configure.ac-uclinux-is-also-linux.patch @@ -0,0 +1,33 @@ +From b3958317c5ee2940e7024bec2e7f288b5a6a26c3 Mon Sep 17 00:00:00 2001 +From: Gustavo Zacarias <gustavo@zacarias.com.ar> +Date: Mon, 30 Jun 2014 10:09:04 -0300 +Subject: [PATCH] configure.ac: uclinux is also linux + +uclinux is used in the tuple for some noMMU linux builds like Blackfin +FLAT output, so accept it as linux too. + +Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 436d0e2..50ad478 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -58,10 +58,10 @@ AM_SILENT_RULES([yes]) # make --enable-silent-rules the default. + + AC_CANONICAL_HOST + case "$host_os" in +- linux*) OS=linux ;; ++ linux*|uclinux*) OS=linux ;; + gnu*) OS=gnu ;; + beos*) OS=beos ;; +- *) AC_MSG_ERROR([Unknown or unsupported OS "$host_os". Only "linux", "gnu" and "beos" are supported in this version of GNU Parted.]) ;; ++ *) AC_MSG_ERROR([Unknown or unsupported OS "$host_os". Only "linux", "uclinux", "gnu" and "beos" are supported in this version of GNU Parted.]) ;; + esac + AC_SUBST([OS]) + +-- +1.8.5.5 + diff --git a/package/parted/parted.mk b/package/parted/parted.mk index 15e37a8c63..fd82684a4f 100644 --- a/package/parted/parted.mk +++ b/package/parted/parted.mk @@ -9,6 +9,8 @@ PARTED_SOURCE = parted-$(PARTED_VERSION).tar.xz PARTED_SITE = $(BR2_GNU_MIRROR)/parted PARTED_DEPENDENCIES = util-linux PARTED_INSTALL_STAGING = YES +# For uclinux patch +PARTED_AUTORECONF = YES PARTED_LICENSE = GPLv3+ PARTED_LICENSE_FILES = COPYING @@ -26,6 +28,10 @@ else PARTED_CONF_OPT += --disable-device-mapper endif +ifeq ($(BR2_PREFER_STATIC_LIB),y) +PARTED_CONF_OPT += --disable-dynamic-loading +endif + HOST_PARTED_DEPENDENCIES = host-util-linux HOST_PARTED_CONF_OPT += \ --without-readline \ |
