diff options
author | Juergen Borleis <jbe@pengutronix.de> | 2017-08-28 12:17:49 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-08-29 10:45:50 +0200 |
commit | 9c626ceee7cb11830c60704031d5e0cce3694d07 (patch) | |
tree | 64dd20c3acc2c4e637e802abd2a3c0c02e33f5f3 /patches/which-2.21 | |
parent | c8871abd7b2d2c3ea99914f4eefe8bdf2d2db0d2 (diff) | |
download | ptxdist-9c626ceee7cb11830c60704031d5e0cce3694d07.tar.gz ptxdist-9c626ceee7cb11830c60704031d5e0cce3694d07.tar.xz |
which: version bump and large file awareness
'which' fails on filesystems with inodes wider than 32 bit. Add large
file support to make it work as intended.
Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/which-2.21')
-rw-r--r-- | patches/which-2.21/0001-buildsystem-using-macros-this-way-is-bogus.patch | 52 | ||||
-rw-r--r-- | patches/which-2.21/0002-buildsystem-add-large-file-support.patch | 22 | ||||
l--------- | patches/which-2.21/autogen.sh | 1 | ||||
-rw-r--r-- | patches/which-2.21/series | 5 |
4 files changed, 80 insertions, 0 deletions
diff --git a/patches/which-2.21/0001-buildsystem-using-macros-this-way-is-bogus.patch b/patches/which-2.21/0001-buildsystem-using-macros-this-way-is-bogus.patch new file mode 100644 index 000000000..8e6e14272 --- /dev/null +++ b/patches/which-2.21/0001-buildsystem-using-macros-this-way-is-bogus.patch @@ -0,0 +1,52 @@ +From: Juergen Borleis <jbe@pengutronix.de> +Date: Fri, 25 Aug 2017 15:14:32 +0200 +Subject: [PATCH] buildsystem: using macros this way is bogus + +'cwautomacros' is a nice, but broken way to use autotools. Remove the +dependency to this external package. + +Signed-off-by: Juergen Borleis <jbe@pengutronix.de> +--- + ChangeLog | 0 + Makefile.am | 1 - + configure.ac | 3 --- + tilde/Makefile.am | 1 - + 4 files changed, 5 deletions(-) + create mode 100644 ChangeLog + +diff --git a/ChangeLog b/ChangeLog +new file mode 100644 +index 000000000000..e69de29bb2d1 +diff --git a/Makefile.am b/Makefile.am +index 84176c3f45ef..d9d8115a6758 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,5 +1,4 @@ + AUTOMAKE_OPTIONS = no-texinfo.tex +-ACLOCAL_AMFLAGS=@ACLOCAL_CWFLAGS@ + + SUBDIRS = tilde . + +diff --git a/configure.ac b/configure.ac +index 172e3453a553..0c782b45455d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -5,9 +5,6 @@ AM_INIT_AUTOMAKE + AM_CONFIG_HEADER(config.h) + AM_MAINTAINER_MODE + +-dnl Because we use cwautomacros. +-CW_AUTOMACROS +- + which_cv_iberty=yes + AC_ARG_ENABLE(iberty, + [ --disable-iberty do not try to find and use the iberty library], +diff --git a/tilde/Makefile.am b/tilde/Makefile.am +index 4947448e00d5..1a72615bafc6 100644 +--- a/tilde/Makefile.am ++++ b/tilde/Makefile.am +@@ -1,4 +1,3 @@ +-ACLOCAL_AMFLAGS=@ACLOCAL_CWFLAGS@ + AUTOMAKE_OPTIONS = foreign + noinst_LIBRARIES = libtilde.a + libtilde_a_SOURCES = tilde.c shell.c tilde.h ansi_stdlib.h bashansi.h xmalloc.h diff --git a/patches/which-2.21/0002-buildsystem-add-large-file-support.patch b/patches/which-2.21/0002-buildsystem-add-large-file-support.patch new file mode 100644 index 000000000..07785ed8b --- /dev/null +++ b/patches/which-2.21/0002-buildsystem-add-large-file-support.patch @@ -0,0 +1,22 @@ +From: Juergen Borleis <jbe@pengutronix.de> +Date: Fri, 25 Aug 2017 14:49:05 +0200 +Subject: [PATCH] buildsystem: add large file support + +Signed-off-by: Juergen Borleis <jbe@pengutronix.de> +--- + configure.ac | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 0c782b45455d..06e509fb97ad 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -16,6 +16,8 @@ AC_PROG_INSTALL + AC_LANG_C + AC_MINIX + ++AC_SYS_LARGEFILE ++ + dnl Checks for libraries. + if test "$which_cv_iberty" = yes ; then + AC_CHECK_STATICLIB(libiberty.a, xmalloc) diff --git a/patches/which-2.21/autogen.sh b/patches/which-2.21/autogen.sh new file mode 120000 index 000000000..9f8a4cb7d --- /dev/null +++ b/patches/which-2.21/autogen.sh @@ -0,0 +1 @@ +../autogen.sh
\ No newline at end of file diff --git a/patches/which-2.21/series b/patches/which-2.21/series new file mode 100644 index 000000000..68cbdeed2 --- /dev/null +++ b/patches/which-2.21/series @@ -0,0 +1,5 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-buildsystem-using-macros-this-way-is-bogus.patch +0002-buildsystem-add-large-file-support.patch +# f3beee1b6d41d7424e3f37436cab395e - git-ptx-patches magic |