commit: 7efb6d706078ae761e238bdf4828fae9c2c6dbe8 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Jun 15 19:26:37 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Jun 15 19:36:16 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7efb6d70
x11-plugins/cputnik: fix build with lld Closes: https://bugs.gentoo.org/732444 Signed-off-by: Sam James <sam <AT> gentoo.org> x11-plugins/cputnik/cputnik-0.2.0-r1.ebuild | 8 +++++--- x11-plugins/cputnik/files/cputnik-0.2.0-libdir.patch | 12 ++++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/x11-plugins/cputnik/cputnik-0.2.0-r1.ebuild b/x11-plugins/cputnik/cputnik-0.2.0-r1.ebuild index eb195d5a676b..031cf79deae7 100644 --- a/x11-plugins/cputnik/cputnik-0.2.0-r1.ebuild +++ b/x11-plugins/cputnik/cputnik-0.2.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -22,9 +22,11 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${P}/src -PATCHES=( "${FILESDIR}"/${P}-makefile.patch +PATCHES=( + "${FILESDIR}"/${P}-makefile.patch "${FILESDIR}"/${P}-fno-common.patch - ) + "${FILESDIR}"/${P}-libdir.patch +) src_compile() { emake CC="$(tc-getCC)" diff --git a/x11-plugins/cputnik/files/cputnik-0.2.0-libdir.patch b/x11-plugins/cputnik/files/cputnik-0.2.0-libdir.patch new file mode 100644 index 000000000000..4c613d739f08 --- /dev/null +++ b/x11-plugins/cputnik/files/cputnik-0.2.0-libdir.patch @@ -0,0 +1,12 @@ +https://bugs.gentoo.org/732444 +--- a/Makefile ++++ b/Makefile +@@ -1,7 +1,7 @@ + + CFLAGS += -Wall + INCS = -I/usr/include/X11 +-LIBS = -L/usr/lib -lXpm -lXext -lX11 ++LIBS = -lXpm -lXext -lX11 + INSTALL_PREFIX = /usr + +
