From: Juergen Borleis <jbe@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH 2/3] which: version bump and large file awareness
Date: Mon, 28 Aug 2017 12:17:49 +0200 [thread overview]
Message-ID: <20170828101750.19361-2-jbe@pengutronix.de> (raw)
In-Reply-To: <20170828101750.19361-1-jbe@pengutronix.de>
'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>
---
...uildsystem-using-macros-this-way-is-bogus.patch | 52 ++++++++++++++++++++++
.../0002-buildsystem-add-large-file-support.patch | 22 +++++++++
patches/which-2.21/autogen.sh | 1 +
patches/which-2.21/series | 5 +++
rules/which.make | 4 +-
5 files changed, 82 insertions(+), 2 deletions(-)
create mode 100644 patches/which-2.21/0001-buildsystem-using-macros-this-way-is-bogus.patch
create mode 100644 patches/which-2.21/0002-buildsystem-add-large-file-support.patch
create mode 120000 patches/which-2.21/autogen.sh
create mode 100644 patches/which-2.21/series
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
diff --git a/rules/which.make b/rules/which.make
index e5b3c6b23..f5bd76b67 100644
--- a/rules/which.make
+++ b/rules/which.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_WHICH) += which
#
# Paths and names
#
-WHICH_VERSION := 2.20
-WHICH_MD5 := 95be0501a466e515422cde4af46b2744
+WHICH_VERSION := 2.21
+WHICH_MD5 := 097ff1a324ae02e0a3b0369f07a7544a
WHICH := which-$(WHICH_VERSION)
WHICH_SUFFIX := tar.gz
WHICH_URL := $(call ptx/mirror, GNU, which/$(WHICH).$(WHICH_SUFFIX))
--
2.11.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
next prev parent reply other threads:[~2017-08-28 10:17 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-28 10:17 [ptxdist] [PATCH 1/3] libgcrypt: version bump to 1.8 stable release Juergen Borleis
2017-08-28 10:17 ` Juergen Borleis [this message]
2017-08-28 10:17 ` [ptxdist] [PATCH 3/3] libseccomp: install some useful development tools on demand Juergen Borleis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170828101750.19361-2-jbe@pengutronix.de \
--to=jbe@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox