diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-08-25 14:49:17 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-08-25 14:49:17 +0200 |
| commit | a99b1bb24fa09ecbdcde0364514d3690caaadcc8 (patch) | |
| tree | 7abf0c1fff6a0b871a2f5a12200d32a06c2c9d35 /package/util-linux | |
| parent | 2c31d745ac08e620d143cc266e2b7113754a8787 (diff) | |
| parent | 311e0a6fc49a2135a3a5e1e63fe8b77c184cb8c9 (diff) | |
| download | buildroot-novena-a99b1bb24fa09ecbdcde0364514d3690caaadcc8.tar.gz buildroot-novena-a99b1bb24fa09ecbdcde0364514d3690caaadcc8.zip | |
Merge branch 'for-2010.08' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'package/util-linux')
| -rw-r--r-- | package/util-linux/util-linux-2.13-pre17-hardcode-a-out-constants.patch | 41 | ||||
| -rw-r--r-- | package/util-linux/util-linux.mk | 4 |
2 files changed, 45 insertions, 0 deletions
diff --git a/package/util-linux/util-linux-2.13-pre17-hardcode-a-out-constants.patch b/package/util-linux/util-linux-2.13-pre17-hardcode-a-out-constants.patch new file mode 100644 index 000000000..b115c410e --- /dev/null +++ b/package/util-linux/util-linux-2.13-pre17-hardcode-a-out-constants.patch @@ -0,0 +1,41 @@ +Hardcode a.out related constants + +The OMAGIC, NMAGIC and ZMAGIC constants, related to the legacy a.out +binary format, are no longer available in the headers of all +architectures, due to this binary format being deprecated. For that +reason, util-linux fails to build. + +We therefore take the approach used in newer versions of +util-linux-ng: hardcoding those values. See +http://git.kernel.org/?p=utils/util-linux-ng/util-linux-ng.git;a=commitdiff;h=e9eb4dad0ece03914f67f6d1ded74cfbbe694ba4 + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +--- + text-utils/more.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +Index: util-linux-2.13-pre7/text-utils/more.c +=================================================================== +--- util-linux-2.13-pre7.orig/text-utils/more.c ++++ util-linux-2.13-pre7/text-utils/more.c +@@ -53,7 +53,6 @@ + #include <sys/stat.h> + #include <sys/file.h> + #include <sys/wait.h> +-#include <a.out.h> + #include <locale.h> + #include "xstrncpy.h" + #include "nls.h" +@@ -504,9 +503,9 @@ + + if (fread(twobytes, 2, 1, f) == 1) { + switch(twobytes[0] + (twobytes[1]<<8)) { +- case OMAGIC: /* 0407 */ +- case NMAGIC: /* 0410 */ +- case ZMAGIC: /* 0413 */ ++ case 0407: /* a.out obj */ ++ case 0410: /* a.out exec */ ++ case 0413: /* a.out demand exec */ + case 0405: + case 0411: + case 0177545: diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index f330447fb..445b4d1c7 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -23,6 +23,10 @@ UTIL-LINUX_DEPENDENCIES += gettext libintl UTIL-LINUX_MAKE_OPT = LIBS=-lintl endif +ifeq ($(BR2_PACKAGE_NCURSES),y) +UTIL-LINUX_DEPENDENCIES += ncurses +endif + $(DL_DIR)/$(UTIL-LINUX_SOURCE): $(call DOWNLOAD,$(UTIL-LINUX_SITE),$(UTIL-LINUX_SOURCE)) |