diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-12-13 12:11:02 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-01-06 17:33:23 +0000 |
| commit | c033fb48e3be8a2a1b26b55826dfffc66e04e0b6 (patch) | |
| tree | 83ce8e1e22bba728d752283d94d1559a9587f4f9 /meta | |
| parent | 99f1aa47364b59b0f00b90b5e4a959546cfda105 (diff) | |
| download | poky-c033fb48e3be8a2a1b26b55826dfffc66e04e0b6.tar.gz | |
libnewt: update 0.52.21 -> 0.52.23
(From OE-Core rev: 95a1668668ad962a3cb8676f08d1bb568f12436f)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit ff12622451f1f8580f928c6771cd82daa632071c)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-extended/newt/files/0001-detect-gold-as-GNU-linker-too.patch | 14 | ||||
| -rw-r--r-- | meta/recipes-extended/newt/files/0002-don-t-ignore-CFLAGS-when-building-snack.patch | 29 | ||||
| -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 @@ | |||
| 1 | From 58245b859ffbcb1780575bf1b0a018d55e74e434 Mon Sep 17 00:00:00 2001 | 1 | From 08ba909500412611953aea0fa2fe0d8fe76b6e24 Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> |
| 3 | Date: Wed, 21 Sep 2016 21:14:40 +0200 | 3 | Date: Wed, 21 Sep 2016 21:14:40 +0200 |
| 4 | Subject: [PATCH] detect gold as GNU linker too | 4 | Subject: [PATCH] detect gold as GNU linker too |
| @@ -9,23 +9,21 @@ Content-Transfer-Encoding: 8bit | |||
| 9 | Upstream-Status: Pending | 9 | Upstream-Status: Pending |
| 10 | 10 | ||
| 11 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | 11 | Signed-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 | ||
| 16 | diff --git a/configure.ac b/configure.ac | 17 | diff --git a/configure.ac b/configure.ac |
| 17 | index 03e8bda..c2fce51 100644 | 18 | index 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 | -- | ||
| 30 | 2.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 @@ | |||
| 1 | From f60dc1063607ca1f201ba4cbda467d8af3f78f64 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Miroslav Lichvar <mlichvar@redhat.com> | ||
| 3 | Date: Tue, 1 Oct 2019 16:37:55 +0200 | ||
| 4 | Subject: [PATCH] don't ignore CFLAGS when building snack | ||
| 5 | |||
| 6 | In addition to the flags returned by python-config --cflags, use the | ||
| 7 | user-specified CFLAGS when building the snack object. | ||
| 8 | |||
| 9 | Upstream-Status: Backport from master | ||
| 10 | Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> | ||
| 11 | --- | ||
| 12 | Makefile.in | 4 ++-- | ||
| 13 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 14 | |||
| 15 | diff --git a/Makefile.in b/Makefile.in | ||
| 16 | index 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 | ||
| 27 | SRC_URI[md5sum] = "a0a5fd6b53bb167a65e15996b249ebb5" | 26 | SRC_URI[sha256sum] = "caa372907b14ececfe298f0d512a62f41d33b290610244a58aed07bbc5ada12a" |
| 28 | SRC_URI[sha256sum] = "265eb46b55d7eaeb887fca7a1d51fe115658882dfe148164b6c49fccac5abb31" | ||
| 29 | 27 | ||
| 30 | S = "${WORKDIR}/newt-${PV}" | 28 | S = "${WORKDIR}/newt-${PV}" |
| 31 | 29 | ||
