From 514d1bbe260df2521fe60f1a3ec87cfcfde1a829 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 17 Jul 2021 19:04:28 +0100 Subject: gentoo resync : 17.07.2021 --- dev-libs/newt/Manifest | 4 ++- .../newt-0.52.21-fix-non-POSIX-backticks.patch | 27 +++++++++++++++++++ .../newt-0.52.21-makefile-LDFLAGS-ordering.patch | 30 ++++++++++++++++++++++ dev-libs/newt/newt-0.52.21-r1.ebuild | 14 ++++++---- 4 files changed, 69 insertions(+), 6 deletions(-) create mode 100644 dev-libs/newt/files/newt-0.52.21-fix-non-POSIX-backticks.patch create mode 100644 dev-libs/newt/files/newt-0.52.21-makefile-LDFLAGS-ordering.patch (limited to 'dev-libs/newt') diff --git a/dev-libs/newt/Manifest b/dev-libs/newt/Manifest index ca8c311e519d..a53ae0239352 100644 --- a/dev-libs/newt/Manifest +++ b/dev-libs/newt/Manifest @@ -1,6 +1,8 @@ AUX newt-0.52.13-gold.patch 362 BLAKE2B 2f40cfe7e4b2b01b755c787d22d2006c2c55ca055c02f6ff2d807dc36fb15c15e67c2aa5d3ac4ae11288e710e6e0e4830dced12a0817e395fcc2331547228eb8 SHA512 6f3a68b75fae6693ddbb47b88f8ede4a6994daa4476b3ca472b3ec62db26e36785e3bb7fe7375a9e78ffd0761a4d82351f5d02c30f8ddd55fa5648257526e98f AUX newt-0.52.14-tcl.patch 3269 BLAKE2B dc542330cf49a43d63ca6e3edea141ae62664a701038c1086715b7de899f4b987c87069be8fd3a57f1f4c3fe8292d298876cf01f34e9d1f66f59ab7c08134d50 SHA512 6074f53b4070f4d8c7e1f4dfc4de7c549ac63a4af4bae70a3ebc3ebb03bd588923e8a952ffd93139041f5454318958a50a8ca8b0ecd98fb5d2ebde74b42aa313 +AUX newt-0.52.21-fix-non-POSIX-backticks.patch 794 BLAKE2B ffeba1923f7ce7d9f8349e6880b1439c3376f47cfa742e2b236b2072e3420120e1c6858437e1921295b752d63389aeea27eb5b22d39967d88f4894d153e22d42 SHA512 2e4c4c68add4a6ac107efa08fcff20d4a557252ebf246d38875d2f428432ba739469ab4200d94d3dfaf7ddec28e0b029e628e3b18678fad0cc2af731e7477032 +AUX newt-0.52.21-makefile-LDFLAGS-ordering.patch 1201 BLAKE2B 58d895ba0da3a1ce139a7257035ff41279c3432d002e57261e0d9051b6c6baf8044e774329bb24ed6807f42099817a4ca7cb2138ee3dbc37e3c3dafbf1d7d816 SHA512 e1f9e54238e2e6c700d301cb3017797b7dd396691528a7007bf4b316684269d6e4daf1f6973389e0403341bc650ffbed4b01ffa890e8d53af5a761941e93a03f AUX newt-0.52.21-python-sitedir.patch 954 BLAKE2B ed2a504cc2e2c06200e209fdf55e9b3ce01c502bd1a6898c6c56e5ecedfcc5672ab619f52d3ad3828569996d11302bdc24cc484f3d65a85d27b5e8c564e12311 SHA512 3583b352d2e46e12f03a1d3b0fcaab606018765b1ae8855a7160bced34b36235a4ed0cd2b4cda1202e40680d6d8a7ad7a93aec0b46d2ee17a091509cf079c9b4 DIST newt-0.52.21.tar.gz 174895 BLAKE2B a0d6a15f87fe04dc535e65fcd28606cd666142d006a53b6ee0c8387a6295215e44f1815ac56ceb56b561ca9b5bc8f3cab2d04b5decd62642f46b744333dc7e34 SHA512 d53d927996d17223e688bf54dccfabb2a3dc02bfe38ffc455964e86feaca3cd9f9ab5b19774433be430fa4d761cd9b6680b558f297acb86f80daeb6942f7d23c -EBUILD newt-0.52.21-r1.ebuild 2257 BLAKE2B 1a37298bb31eaa7c1dd2c9f7c84ce4559ffac24da3daf871fca504a27e31acc52e6025dab949f5b8bf16c8a7ae8b1f9375461367be926b0589a09e3c75e8495b SHA512 dc4bc7d10254340258012c60ea87315abbb7546715daacf4261d8b07a708df302d6388becd54ccdde8dda46501203dc43d8effc3da0b20793f737fba72dc467e +EBUILD newt-0.52.21-r1.ebuild 2369 BLAKE2B f1cd44617d3daee421d3c8c9d9ba8c9e2b070b4192334967198492dc70a1f690f24cff6d7e457aff35484c6fcca5348410847989556d7b2a991097dcb30753cb SHA512 7a5b8d178f6129d0b2eb2f9ac33ee75e5bf0f2d5112c328e5964b35886648ddf826bb038ca85a2debeaf98cfb9a89c1c4614c38de39e11dd5b92dbc0c759ab7d MISC metadata.xml 250 BLAKE2B b9f4109bece0ad2b6afb8c0b16fe12f39bf1851a9b1201e3a26cfd1eb86d9a9999ebbae97a6fdf8bbfc18cb213c9cfd8eba72c3731742429c44659795f33d87a SHA512 4ebf7bc5513be89eaf0f32aa1b41c095085cd95486e7ecc7cdc61e3f3a16119318f821a954cb2ba16e8408f6d00f1bee3923d7b4ae35aab54c0e21c6f33e56cd diff --git a/dev-libs/newt/files/newt-0.52.21-fix-non-POSIX-backticks.patch b/dev-libs/newt/files/newt-0.52.21-fix-non-POSIX-backticks.patch new file mode 100644 index 000000000000..3d6b87030dd6 --- /dev/null +++ b/dev-libs/newt/files/newt-0.52.21-fix-non-POSIX-backticks.patch @@ -0,0 +1,27 @@ +From a37a8c15f4653b4edea414f42a0d76f3b1f5652c Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Wed, 14 Jul 2021 05:19:25 +0100 +Subject: [PATCH] Fix non-POSIX backticks + +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index cb2b940..9ba4c64 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -23,8 +23,8 @@ AC_CHECK_SIZEOF([void *]) + AC_MSG_CHECKING([for GNU ld]) + LD=`$CC -print-prog-name=ld 2>&5` + +-if test `$LD -v 2>&1 | $ac_cv_path_GREP -c "GNU ld"` = 0 -a \ +- test `$LD -v 2>&1 | $ac_cv_path_GREP -c "GNU gold"` = 0; then ++if test $($LD -v 2>&1 | $ac_cv_path_GREP -c "GNU ld") = 0 -a \ ++ $($LD -v 2>&1 | $ac_cv_path_GREP -c "GNU gold") = 0; then + # Not + GNU_LD="" + AC_MSG_RESULT([no]) +-- +2.32.0 + diff --git a/dev-libs/newt/files/newt-0.52.21-makefile-LDFLAGS-ordering.patch b/dev-libs/newt/files/newt-0.52.21-makefile-LDFLAGS-ordering.patch new file mode 100644 index 000000000000..f05075adb371 --- /dev/null +++ b/dev-libs/newt/files/newt-0.52.21-makefile-LDFLAGS-ordering.patch @@ -0,0 +1,30 @@ +From 22d44d2cbfcbec216d0028ebdf274247139a8045 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Wed, 14 Jul 2021 05:12:32 +0100 +Subject: [PATCH] Swap order of LDFLAGS and P*FLAGS + +Needed to respect as-needed. + +Bug: https://bugs.gentoo.org/798945 +--- + Makefile.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 1047efc..f0bc417 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -97,8 +97,8 @@ _snack.$(SOEXT): snack.c $(LIBNEWTSH) + PLFLAGS=`$$pyconfig --libs`; \ + echo $(CC) $(SHCFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snack.o snack.c; \ + $(CC) $(SHCFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snack.o snack.c; \ +- echo $(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snack.$(SOEXT) $$ver/snack.o -L. -lnewt $(LIBS); \ +- $(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snack.$(SOEXT) $$ver/snack.o -L. -lnewt $(LIBS); \ ++ echo $(CC) --shared $(LDFLAGS) $$PLDFLAGS $$PLFLAGS -o $$ver/_snack.$(SOEXT) $$ver/snack.o -L. -lnewt $(LIBS); \ ++ $(CC) --shared $(LDFLAGS) $$PLDFLAGS $$PLFLAGS -o $$ver/_snack.$(SOEXT) $$ver/snack.o -L. -lnewt $(LIBS); \ + done || : + touch $@ + +-- +2.32.0 + diff --git a/dev-libs/newt/newt-0.52.21-r1.ebuild b/dev-libs/newt/newt-0.52.21-r1.ebuild index 4eb95be86239..b2727a258f8d 100644 --- a/dev-libs/newt/newt-0.52.21-r1.ebuild +++ b/dev-libs/newt/newt-0.52.21-r1.ebuild @@ -29,6 +29,14 @@ RDEPEND=" " DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}"/${PN}-0.52.13-gold.patch + "${FILESDIR}"/${PN}-0.52.14-tcl.patch + "${FILESDIR}"/${PN}-0.52.21-python-sitedir.patch + "${FILESDIR}"/${PN}-0.52.21-makefile-LDFLAGS-ordering.patch + "${FILESDIR}"/${PN}-0.52.21-fix-non-POSIX-backticks.patch +) + src_prepare() { # bug 73850 if use elibc_uclibc; then @@ -54,11 +62,7 @@ src_prepare() { || die "sed po/Makefile" fi - eapply \ - "${FILESDIR}"/${PN}-0.52.13-gold.patch \ - "${FILESDIR}"/${PN}-0.52.14-tcl.patch \ - "${FILESDIR}"/${PN}-0.52.21-python-sitedir.patch - eapply_user + default eautoreconf # can't build out-of-source -- cgit v1.2.3