summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2010-08-10 17:08:10 (GMT)
committer Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2010-08-10 17:22:09 (GMT)
commit55f70939b839cd5ad826ea01fcb6d363d63ee15d (patch)
treec8347930c3fc7e4f04f0e40524c214327d9de429
parent2ef83b42b97e7a098c9bef34109c5a8896a17b76 (diff)
downloadbuildroot-55f70939b839cd5ad826ea01fcb6d363d63ee15d.tar.gz
buildroot-55f70939b839cd5ad826ea01fcb6d363d63ee15d.tar.bz2
Fix util-linux build on MIPS
As reported in bug #635, util-linux doesn't build due to missing constant definitions related to the a.out binary format. We fix this by hardcoding these constant definitions, as done in newer versions of util-linux. Obviously, the long term fix is to upgrade to util-linux-ng, but this is probably not acceptable for 2010.08. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/util-linux/util-linux-2.13-pre17-hardcode-a-out-constants.patch41
1 files changed, 41 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 0000000..b115c41
--- /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: