summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2022-12-13 12:11:02 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-12-18 19:48:00 +0000
commit6d73fdbcc78bb6dcfb0c3a07481ab20eeabbb3e2 (patch)
tree0f4d073b248e24255220a94d66e30de570bcf3b4
parent7198387cd984f8ed30f3388c7be1b257a148a834 (diff)
downloadpoky-6d73fdbcc78bb6dcfb0c3a07481ab20eeabbb3e2.tar.gz
libnewt: update 0.52.21 -> 0.52.23
(From OE-Core rev: ff12622451f1f8580f928c6771cd82daa632071c) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/newt/files/0001-detect-gold-as-GNU-linker-too.patch14
-rw-r--r--meta/recipes-extended/newt/files/0002-don-t-ignore-CFLAGS-when-building-snack.patch29
-rw-r--r--meta/recipes-extended/newt/libnewt_0.52.23.bb (renamed from meta/recipes-extended/newt/libnewt_0.52.21.bb)4
3 files changed, 7 insertions, 40 deletions
diff --git a/meta/recipes-extended/newt/files/0001-detect-gold-as-GNU-linker-too.patch b/meta/recipes-extended/newt/files/0001-detect-gold-as-GNU-linker-too.patch
index a4b3afd959..090ed5c1c9 100644
--- a/meta/recipes-extended/newt/files/0001-detect-gold-as-GNU-linker-too.patch
+++ b/meta/recipes-extended/newt/files/0001-detect-gold-as-GNU-linker-too.patch
@@ -1,4 +1,4 @@
1From 58245b859ffbcb1780575bf1b0a018d55e74e434 Mon Sep 17 00:00:00 2001 1From 08ba909500412611953aea0fa2fe0d8fe76b6e24 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> 2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Wed, 21 Sep 2016 21:14:40 +0200 3Date: Wed, 21 Sep 2016 21:14:40 +0200
4Subject: [PATCH] detect gold as GNU linker too 4Subject: [PATCH] detect gold as GNU linker too
@@ -9,23 +9,21 @@ Content-Transfer-Encoding: 8bit
9Upstream-Status: Pending 9Upstream-Status: Pending
10 10
11Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> 11Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
12
12--- 13---
13 configure.ac | 2 +- 14 configure.ac | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-) 15 1 file changed, 1 insertion(+), 1 deletion(-)
15 16
16diff --git a/configure.ac b/configure.ac 17diff --git a/configure.ac b/configure.ac
17index 03e8bda..c2fce51 100644 18index 468c718..cd93f30 100644
18--- a/configure.ac 19--- a/configure.ac
19+++ b/configure.ac 20+++ b/configure.ac
20@@ -28,7 +28,7 @@ AC_CHECK_SIZEOF([void *]) 21@@ -28,7 +28,7 @@ AC_CHECK_SIZEOF([void *])
21 AC_MSG_CHECKING([for GNU ld]) 22 AC_MSG_CHECKING([for GNU ld])
22 LD=`$CC -print-prog-name=ld 2>&5` 23 LD=$($CC -print-prog-name=ld 2>&5)
23 24
24-if test `$LD -v 2>&1 | $ac_cv_path_GREP -c "GNU ld"` = 0; then 25-if test $($LD -v 2>&1 | $ac_cv_path_GREP -c "GNU ld") = 0; then
25+if test `$LD -v 2>&1 | $ac_cv_path_GREP -c "GNU "` = 0; then 26+if test $($LD -v 2>&1 | $ac_cv_path_GREP -c "GNU ") = 0; then
26 # Not 27 # Not
27 GNU_LD="" 28 GNU_LD=""
28 AC_MSG_RESULT([no]) 29 AC_MSG_RESULT([no])
29--
302.5.5
31
diff --git a/meta/recipes-extended/newt/files/0002-don-t-ignore-CFLAGS-when-building-snack.patch b/meta/recipes-extended/newt/files/0002-don-t-ignore-CFLAGS-when-building-snack.patch
deleted file mode 100644
index ca235d5108..0000000000
--- a/meta/recipes-extended/newt/files/0002-don-t-ignore-CFLAGS-when-building-snack.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From f60dc1063607ca1f201ba4cbda467d8af3f78f64 Mon Sep 17 00:00:00 2001
2From: Miroslav Lichvar <mlichvar@redhat.com>
3Date: Tue, 1 Oct 2019 16:37:55 +0200
4Subject: [PATCH] don't ignore CFLAGS when building snack
5
6In addition to the flags returned by python-config --cflags, use the
7user-specified CFLAGS when building the snack object.
8
9Upstream-Status: Backport from master
10Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
11---
12 Makefile.in | 4 ++--
13 1 file changed, 2 insertions(+), 2 deletions(-)
14
15diff --git a/Makefile.in b/Makefile.in
16index be5f87b..6facd5e 100644
17--- a/Makefile.in
18+++ b/Makefile.in
19@@ -96,8 +96,8 @@ _snack.$(SOEXT): snack.c $(LIBNEWTSH)
20 PIFLAGS=`$$pyconfig --includes`; \
21 PLDFLAGS=`$$pyconfig --ldflags`; \
22 PLFLAGS=`$$pyconfig --libs`; \
23- echo $(CC) $(SHCFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snack.o snack.c; \
24- $(CC) $(SHCFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snack.o snack.c; \
25+ echo $(CC) $(SHCFLAGS) $(CFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snack.o snack.c; \
26+ $(CC) $(SHCFLAGS) $(CFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snack.o snack.c; \
27 echo $(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snack.$(SOEXT) $$ver/snack.o -L. -lnewt $(LIBS); \
28 $(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snack.$(SOEXT) $$ver/snack.o -L. -lnewt $(LIBS); \
29 done || :
diff --git a/meta/recipes-extended/newt/libnewt_0.52.21.bb b/meta/recipes-extended/newt/libnewt_0.52.23.bb
index 430e481b36..cd3731cf74 100644
--- a/meta/recipes-extended/newt/libnewt_0.52.21.bb
+++ b/meta/recipes-extended/newt/libnewt_0.52.23.bb
@@ -21,11 +21,9 @@ SRC_URI = "https://releases.pagure.org/newt/newt-${PV}.tar.gz \
21 file://cross_ar.patch \ 21 file://cross_ar.patch \
22 file://Makefile.in-Add-tinfo-library-to-the-linking-librari.patch \ 22 file://Makefile.in-Add-tinfo-library-to-the-linking-librari.patch \
23 file://0001-detect-gold-as-GNU-linker-too.patch \ 23 file://0001-detect-gold-as-GNU-linker-too.patch \
24 file://0002-don-t-ignore-CFLAGS-when-building-snack.patch \
25 " 24 "
26 25
27SRC_URI[md5sum] = "a0a5fd6b53bb167a65e15996b249ebb5" 26SRC_URI[sha256sum] = "caa372907b14ececfe298f0d512a62f41d33b290610244a58aed07bbc5ada12a"
28SRC_URI[sha256sum] = "265eb46b55d7eaeb887fca7a1d51fe115658882dfe148164b6c49fccac5abb31"
29 27
30S = "${WORKDIR}/newt-${PV}" 28S = "${WORKDIR}/newt-${PV}"
31 29