summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-06-15 20:26:37 +0100
committerSam James <sam@gentoo.org>2022-06-15 20:36:16 +0100
commit7efb6d706078ae761e238bdf4828fae9c2c6dbe8 (patch)
tree338aa33812365a1bf905348e6561cc4c9bb6159b /x11-plugins/cputnik
parentx11-wm/windowlab: fix build with lld (diff)
downloadgentoo-7efb6d706078ae761e238bdf4828fae9c2c6dbe8.tar.gz
gentoo-7efb6d706078ae761e238bdf4828fae9c2c6dbe8.tar.bz2
gentoo-7efb6d706078ae761e238bdf4828fae9c2c6dbe8.zip
x11-plugins/cputnik: fix build with lld
Closes: https://bugs.gentoo.org/732444 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'x11-plugins/cputnik')
-rw-r--r--x11-plugins/cputnik/cputnik-0.2.0-r1.ebuild8
-rw-r--r--x11-plugins/cputnik/files/cputnik-0.2.0-libdir.patch12
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
+
+