From: Robert Schwebel <r.schwebel@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Robert Schwebel <r.schwebel@pengutronix.de>
Subject: [ptxdist] [PATCHv2] libnewt: version bump 0.52.18 -> 0.52.20
Date: Sun, 30 Apr 2017 11:26:40 +0200 [thread overview]
Message-ID: <20170430092640.18243-1-r.schwebel@pengutronix.de> (raw)
In-Reply-To: <20170428132147.5crpdtdi5xlw7qwi@pengutronix.de>
There are no configure.ac changes.
Two of the patches have been upstreamed in the meantime, so they are not
necessary any more:
- 0001-use-CC-instead-of-CPP-to-generate-.depend-files.patch
- 0002-remove-bogus-I-usr-include-slang-from-CPPFLAGS.patch
The last patch is still necessary and is forward-ported here.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
...-instead-of-CPP-to-generate-.depend-files.patch | 33 ----------------------
...e-bogus-I-usr-include-slang-from-CPPFLAGS.patch | 29 -------------------
patches/newt-0.52.18/series | 6 ----
.../0001-fix-parallel-building.patch} | 2 +-
patches/{newt-0.52.18 => newt-0.52.20}/autogen.sh | 0
patches/newt-0.52.20/series | 4 +++
rules/libnewt.make | 4 +--
7 files changed, 7 insertions(+), 71 deletions(-)
delete mode 100644 patches/newt-0.52.18/0001-use-CC-instead-of-CPP-to-generate-.depend-files.patch
delete mode 100644 patches/newt-0.52.18/0002-remove-bogus-I-usr-include-slang-from-CPPFLAGS.patch
delete mode 100644 patches/newt-0.52.18/series
rename patches/{newt-0.52.18/0003-fix-parallel-building.patch => newt-0.52.20/0001-fix-parallel-building.patch} (94%)
rename patches/{newt-0.52.18 => newt-0.52.20}/autogen.sh (100%)
create mode 100644 patches/newt-0.52.20/series
Changes since (implicit) v1:
* checked if patches are still needed; one is -> ported
diff --git a/patches/newt-0.52.18/0001-use-CC-instead-of-CPP-to-generate-.depend-files.patch b/patches/newt-0.52.18/0001-use-CC-instead-of-CPP-to-generate-.depend-files.patch
deleted file mode 100644
index d593b5b75..000000000
--- a/patches/newt-0.52.18/0001-use-CC-instead-of-CPP-to-generate-.depend-files.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Samuel Martin <s.martin49@gmail.com>
-Date: Sat, 10 Jan 2015 11:57:38 +0100
-Subject: [PATCH] use $(CC) instead of $(CPP) to generate .depend files
-
-Use $(CC) instead of $(CPP) to generate .depend file because '$(CPP)
--M' call does not support multiple input files. This avoid the
-following error:
-
-make[1]: Entering directory `/opt/br/output/build/newt-0.51.0'
-/opt/br/output/host/usr/bin/arm-none-linux-gnueabi-cpp -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -M newt.c button.c form.c checkbox.c entry.c label.c listbox.c scrollbar.c textbox.c scale.c grid.c windows.c buttonbar.c checkboxtree.c > .depend
-arm-none-linux-gnueabi-cpp: too many input files
-make[1]: *** [depend] Error 1
-
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
-Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 798920313a30..17853e011bdb 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -121,7 +121,7 @@ clean:
- $(SHAREDDIR)/*.o *.$(SOEXT)*
-
- depend:
-- $(CPP) $(CFLAGS) $(CPPFLAGS) -M $(SOURCES) > .depend
-+ $(CC) $(CFLAGS) $(CPPFLAGS) -M $(SOURCES) > .depend
-
- $(SHAREDDIR):
- mkdir -p $(SHAREDDIR)
diff --git a/patches/newt-0.52.18/0002-remove-bogus-I-usr-include-slang-from-CPPFLAGS.patch b/patches/newt-0.52.18/0002-remove-bogus-I-usr-include-slang-from-CPPFLAGS.patch
deleted file mode 100644
index 0468c8e57..000000000
--- a/patches/newt-0.52.18/0002-remove-bogus-I-usr-include-slang-from-CPPFLAGS.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Alex Suykov <alex.suykov@gmail.com>
-Date: Sat, 10 Jan 2015 11:57:39 +0100
-Subject: [PATCH] remove bogus -I/usr/include/slang from CPPFLAGS
-
-Hardcoding -I/usr/include/slang in CPPFLAGS is bogus for
-cross-compilation. With recent versions of slang, the headers are
-installed in ${sysroot}/usr/include directly, so there is no need for
-an additional flag. And if one was needed, it should be added by the
-configure script, after detecting the right header location.
-
-Signed-off-by: Alex Suykov <alex.suykov@gmail.com>
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 17853e011bdb..d32d7843659e 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -5,7 +5,7 @@ CC = @CC@
- CPP = @CPP@
- CFLAGS = @CFLAGS@
- LDFLAGS = @LDFLAGS@
--CPPFLAGS = -D_GNU_SOURCE -I/usr/include/slang @CPPFLAGS@
-+CPPFLAGS = -D_GNU_SOURCE @CPPFLAGS@
- GNU_LD = @GNU_LD@
-
- VERSION = @VERSION@
diff --git a/patches/newt-0.52.18/series b/patches/newt-0.52.18/series
deleted file mode 100644
index 558a16c3e..000000000
--- a/patches/newt-0.52.18/series
+++ /dev/null
@@ -1,6 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-use-CC-instead-of-CPP-to-generate-.depend-files.patch
-0002-remove-bogus-I-usr-include-slang-from-CPPFLAGS.patch
-0003-fix-parallel-building.patch
-# 3da7fa330a5dbc1b8f7175767b0d8c44 - git-ptx-patches magic
diff --git a/patches/newt-0.52.18/0003-fix-parallel-building.patch b/patches/newt-0.52.20/0001-fix-parallel-building.patch
similarity index 94%
rename from patches/newt-0.52.18/0003-fix-parallel-building.patch
rename to patches/newt-0.52.20/0001-fix-parallel-building.patch
index 2f6fcbea4..9c800d136 100644
--- a/patches/newt-0.52.18/0003-fix-parallel-building.patch
+++ b/patches/newt-0.52.20/0001-fix-parallel-building.patch
@@ -8,7 +8,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.in b/Makefile.in
-index d32d7843659e..501631acadbf 100644
+index be203e44e691..22e24fe92b3d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -133,7 +133,7 @@ $(LIBNEWTSH): $(SHAREDDIR) $(SHAREDOBJS)
diff --git a/patches/newt-0.52.18/autogen.sh b/patches/newt-0.52.20/autogen.sh
similarity index 100%
rename from patches/newt-0.52.18/autogen.sh
rename to patches/newt-0.52.20/autogen.sh
diff --git a/patches/newt-0.52.20/series b/patches/newt-0.52.20/series
new file mode 100644
index 000000000..c107fa32c
--- /dev/null
+++ b/patches/newt-0.52.20/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-fix-parallel-building.patch
+# 5cc5d42dfd5d2c4a2a35024d9a874950 - git-ptx-patches magic
diff --git a/rules/libnewt.make b/rules/libnewt.make
index c3825c480..2a0946f39 100644
--- a/rules/libnewt.make
+++ b/rules/libnewt.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBNEWT) += libnewt
#
# Paths and names
#
-LIBNEWT_VERSION := 0.52.18
-LIBNEWT_MD5 := 685721bee1a318570704b19dcf31d268
+LIBNEWT_VERSION := 0.52.20
+LIBNEWT_MD5 := 70b288f821234593a8e7920e435b259b
LIBNEWT := newt-$(LIBNEWT_VERSION)
LIBNEWT_SUFFIX := tar.gz
LIBNEWT_URL := https://fedorahosted.org/releases/n/e/newt/$(LIBNEWT).$(LIBNEWT_SUFFIX)
--
2.11.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
next prev parent reply other threads:[~2017-04-30 9:26 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-24 22:18 [ptxdist] [PATCH 1/6] gnutls: version bump 3.3.25 -> 3.3.27 Robert Schwebel
2017-04-24 22:18 ` [ptxdist] [PATCH 2/6] expat: version bump 2.1.1 -> 2.2.0 Robert Schwebel
2017-04-24 22:18 ` [ptxdist] [PATCH 3/6] gmp: version bump 6.0.0a -> 6.1.2 Robert Schwebel
2017-04-24 22:18 ` [ptxdist] [PATCH 4/6] libseccomp: version bump 2.3.1 -> 2.3.2 Robert Schwebel
2017-04-24 22:19 ` [ptxdist] [PATCH 5/6] libnewt: version bump 0.52.18 -> 0.52.20 Robert Schwebel
2017-04-28 13:21 ` Michael Olbrich
2017-04-30 9:26 ` Robert Schwebel [this message]
2017-04-24 22:19 ` [ptxdist] [PATCH 6/6] popt: version bump 1.15 -> 1.16 Robert Schwebel
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=20170430092640.18243-1-r.schwebel@pengutronix.de \
--to=r.schwebel@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