gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-24 18:58:08 -07:00
Code Issues Projects Releases Wiki Activity

dev-libs/newt: fix libcrypt QA warning false positive

Browse Source 
* Fix LDFLAGS ordering (respect as-needed, similar to libxml2)
* Fix configure with non-Bash (dash here)

Closes: https://bugs.gentoo.org/798945
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
2021-07-14 05:29:26 +01:00
parent 1b381caa8b
commit 5570cc4274
3 changed files with 66 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
dev-libs/newt/files/newt-0.52.21-fix-non-POSIX-backticks.patch Normal file
View File

@@ -0,0 +1,27 @@
From a37a8c15f4653b4edea414f42a0d76f3b1f5652c Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
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

30
dev-libs/newt/files/newt-0.52.21-makefile-LDFLAGS-ordering.patch Normal file
View File

@@ -0,0 +1,30 @@
From 22d44d2cbfcbec216d0028ebdf274247139a8045 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
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

14
dev-libs/newt/newt-0.52.21-r1.ebuild
View File

@@ -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