diff options
| author |   Sam James <sam@gentoo.org> | 2021-04-19 07:59:36 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2021-04-19 20:10:26 +0100 |
| commit | 18ee1c360e74f370bd2159831924282f3a2eb3c1 (patch) | |
| tree | 300fcf634e7eebf4a78de0bb26ee04fad5ed378f | |
| parent | x11-misc/seetxt: tidy up patch (diff) | |
| download | gentoo-18ee1c360e74f370bd2159831924282f3a2eb3c1.tar.gz gentoo-18ee1c360e74f370bd2159831924282f3a2eb3c1.tar.bz2 gentoo-18ee1c360e74f370bd2159831924282f3a2eb3c1.zip | |
x11-misc/skippy: respect PKG_CONFIG
Signed-off-by: Sam James <sam@gentoo.org>
| -rw-r--r-- | x11-misc/skippy/files/skippy-0.5.0-Makefile.patch | 4 | ||||
| -rw-r--r-- | x11-misc/skippy/skippy-0.5.0-r1.ebuild | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/x11-misc/skippy/files/skippy-0.5.0-Makefile.patch b/x11-misc/skippy/files/skippy-0.5.0-Makefile.patch index 5c8c64b632f9..2792029a0f5f 100644 --- a/x11-misc/skippy/files/skippy-0.5.0-Makefile.patch +++ b/x11-misc/skippy/files/skippy-0.5.0-Makefile.patch @@ -11,8 +11,8 @@ Don't use LDFLAGS to pass libraries. - -CFLAGS += -I${X11PREFIX}/include `imlib2-config --cflags` `pkg-config xft --cflags` -g -pedantic -Wall -LDFLAGS += -L${X11PREFIX}/lib -lX11 -lm `imlib2-config --libs` `pkg-config xft --libs` -+CFLAGS += `imlib2-config --cflags` `pkg-config xft --cflags` -pedantic -Wall -+LDLIBS = -lX11 -lm `imlib2-config --libs` `pkg-config xft --libs` ++CFLAGS += `imlib2-config --cflags` `${PKG_CONFIG} xft --cflags` -pedantic -Wall ++LDLIBS = -lX11 -lm `imlib2-config --libs` `${PKG_CONFIG} xft --libs` # Comment these out to disable Xinerama support CFLAGS += -DXINERAMA diff --git a/x11-misc/skippy/skippy-0.5.0-r1.ebuild b/x11-misc/skippy/skippy-0.5.0-r1.ebuild index d8db07312cfc..adbe43ec367d 100644 --- a/x11-misc/skippy/skippy-0.5.0-r1.ebuild +++ b/x11-misc/skippy/skippy-0.5.0-r1.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit toolchain-funcs DESCRIPTION="A full-screen task-switcher providing Apple Expose-like functionality" @@ -11,7 +12,6 @@ SRC_URI="http://thegraveyard.org/files/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc x86" -IUSE="" RDEPEND="media-libs/imlib2[X] x11-libs/libXext @@ -20,8 +20,8 @@ RDEPEND="media-libs/imlib2[X] x11-libs/libXmu x11-libs/libXft" DEPEND="${RDEPEND} - x11-base/xorg-proto - virtual/pkgconfig" + x11-base/xorg-proto" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-pointer-size.patch @@ -32,7 +32,7 @@ PATCHES=( DOCS=( CHANGELOG skippyrc-default ) src_compile() { - tc-export CC + tc-export CC PKG_CONFIG default } |