diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-03-29 14:30:58 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-03-29 18:54:25 +0200 |
| commit | 47eb15df56a7c6c705d26f71e50b4794d00a4a29 (patch) | |
| tree | 1cd69a632f67ca63825141007d3d77a0f58699c7 /package/util-linux | |
| parent | 41e2f30aae4be471dfddf3b3e2690a1f46e41eac (diff) | |
fix build for sparc
Diffstat (limited to 'package/util-linux')
| -rw-r--r-- | package/util-linux/Makefile | 2 | ||||
| -rw-r--r-- | package/util-linux/patches/patch-configure_ac | 6 | ||||
| -rw-r--r-- | package/util-linux/patches/patch-sys-utils_setarch_c | 11 |
3 files changed, 15 insertions, 4 deletions
diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index 33ac27093..68f196009 100644 --- a/package/util-linux/Makefile +++ b/package/util-linux/Makefile @@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= util-linux PKG_VERSION:= 2.26.1 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_EXTRAVER:= v2.26 PKG_HASH:= 22dc1c957262e2cbdfb4d524a63d5cd4f219d3ac9b5eab570fc771076799bb6e PKG_DESCR:= basic utilities diff --git a/package/util-linux/patches/patch-configure_ac b/package/util-linux/patches/patch-configure_ac index 9c105920a..0b2dd038f 100644 --- a/package/util-linux/patches/patch-configure_ac +++ b/package/util-linux/patches/patch-configure_ac @@ -1,5 +1,5 @@ ---- util-linux-2.26.orig/configure.ac 2015-02-19 06:11:13.146192401 -0600 -+++ util-linux-2.26/configure.ac 2015-03-09 17:43:49.200785697 -0500 +--- util-linux-2.26.1.orig/configure.ac 2015-03-13 14:11:19.000000000 +0100 ++++ util-linux-2.26.1/configure.ac 2015-03-29 11:28:46.000000000 +0200 @@ -60,16 +60,6 @@ LIBFDISK_LT_MINOR=1 LIBFDISK_LT_MICRO=0 LIBFDISK_VERSION_INFO=`expr $LIBFDISK_LT_MAJOR + $LIBFDISK_LT_MINOR`:$LIBFDISK_LT_MICRO:$LIBFDISK_LT_MINOR @@ -34,7 +34,7 @@ AC_CHECK_HEADERS([linux/compiler.h linux/blkpg.h linux/major.h], [], [], [ #ifdef HAVE_LINUX_COMPILER_H #include <linux/compiler.h> -@@ -1900,7 +1879,9 @@ libmount/src/libmount.h +@@ -1911,7 +1891,9 @@ libmount/src/libmount.h libsmartcols/docs/Makefile libsmartcols/docs/version.xml libsmartcols/src/libsmartcols.h diff --git a/package/util-linux/patches/patch-sys-utils_setarch_c b/package/util-linux/patches/patch-sys-utils_setarch_c new file mode 100644 index 000000000..16558fa24 --- /dev/null +++ b/package/util-linux/patches/patch-sys-utils_setarch_c @@ -0,0 +1,11 @@ +--- util-linux-2.26.1.orig/sys-utils/setarch.c 2015-02-19 10:55:10.000000000 +0100 ++++ util-linux-2.26.1/sys-utils/setarch.c 2015-03-29 11:46:25.000000000 +0200 +@@ -309,7 +309,7 @@ int main(int argc, char *argv[]) + #if defined(__sparc64__) || defined(__sparc__) + if (archwrapper && strcmp(arch, "sparc32bash") == 0) { + if (set_arch(arch, 0L, 0)) +- err(EXIT_FAILURE, _("Failed to set personality to %s"), p); ++ err(EXIT_FAILURE, _("Failed to set personality to %s"), arch); + execl("/bin/bash", NULL); + err(EXIT_FAILURE, _("failed to execute %s"), "/bin/bash"); + } |