diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2020-02-13 12:38:14 +0100 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2020-02-13 12:44:23 +0100 |
| commit | ab10867981c48b3052918bd1116e988eb5bd38c9 (patch) | |
| tree | c93ad46233853836a4498bf06abed5e67fa54c8f /sys-libs/ncurses | |
| parent | dev-util/debootstrap: Version 1.0.117 (diff) | |
| download | gentoo-ab10867981c48b3052918bd1116e988eb5bd38c9.tar.gz gentoo-ab10867981c48b3052918bd1116e988eb5bd38c9.tar.bz2 gentoo-ab10867981c48b3052918bd1116e988eb5bd38c9.zip | |
sys-libs/ncurses: Revbump to not bleed LDFLAGS into Libs
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'sys-libs/ncurses')
| -rw-r--r-- | sys-libs/ncurses/files/ncurses-6.2-no_user_ldflags_in_libs.patch | 40 | ||||
| -rw-r--r-- | sys-libs/ncurses/ncurses-6.2-r1.ebuild (renamed from sys-libs/ncurses/ncurses-6.2.ebuild) | 1 |
2 files changed, 41 insertions, 0 deletions
diff --git a/sys-libs/ncurses/files/ncurses-6.2-no_user_ldflags_in_libs.patch b/sys-libs/ncurses/files/ncurses-6.2-no_user_ldflags_in_libs.patch new file mode 100644 index 000000000000..66345b51fe24 --- /dev/null +++ b/sys-libs/ncurses/files/ncurses-6.2-no_user_ldflags_in_libs.patch @@ -0,0 +1,40 @@ +From be554be06475b36da2f69aabfd873ad55f7ef95c Mon Sep 17 00:00:00 2001 +From: Lars Wendler <polynomial-c@gentoo.org> +Date: Thu, 13 Feb 2020 11:51:09 +0100 +Subject: [PATCH] Don't bleed user LDFLAGS into Libs + +Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> +--- + misc/gen-pkgconfig.in | 2 +- + misc/ncurses-config.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in +index 8f00b824..009d2156 100644 +--- a/misc/gen-pkgconfig.in ++++ b/misc/gen-pkgconfig.in +@@ -80,7 +80,7 @@ if [ "$includedir" != "/usr/include" ]; then + fi + + lib_flags= +-for opt in -L$libdir @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@ ++for opt in -L$libdir @LIBS@ + do + case $opt in + -l*) # LIBS is handled specially below +diff --git a/misc/ncurses-config.in b/misc/ncurses-config.in +index 7f8ba697..2f1915cd 100644 +--- a/misc/ncurses-config.in ++++ b/misc/ncurses-config.in +@@ -101,7 +101,7 @@ fi + # There is no portable way to find the list of standard library directories. + # Require a POSIX shell anyway, to keep this simple. + lib_flags= +-for opt in -L$libdir @LDFLAGS@ @EXTRA_LDFLAGS@ $LIBS ++for opt in -L$libdir $LIBS + do + case $opt in + -specs*) # ignore linker specs-files which were used to build library +-- +2.25.0 + diff --git a/sys-libs/ncurses/ncurses-6.2.ebuild b/sys-libs/ncurses/ncurses-6.2-r1.ebuild index b5bc19b8f78d..6c96fc33f99a 100644 --- a/sys-libs/ncurses/ncurses-6.2.ebuild +++ b/sys-libs/ncurses/ncurses-6.2-r1.ebuild @@ -41,6 +41,7 @@ PATCHES=( "${FILESDIR}/${PN}-5.9-gcc-5.patch" #545114 "${FILESDIR}/${PN}-6.0-ticlib.patch" #557360 "${FILESDIR}/${PN}-6.0-cppflags-cross.patch" #601426 + "${FILESDIR}/${PN}-6.2-no_user_ldflags_in_libs.patch" ) src_prepare() { |