summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2021-04-19 07:44:12 +0100
committerSam James <sam@gentoo.org>2021-04-19 20:10:01 +0100
commit4c8cfd8a97c5f353e96e2393b8bdfc495a3b426a (patch)
tree50b6a1672bebdef6d71e8216b193e12a6751736a
parentmedia-sound/bristol: respect ${PKG_CONFIG} (diff)
downloadgentoo-4c8cfd8a97c5f353e96e2393b8bdfc495a3b426a.tar.gz
gentoo-4c8cfd8a97c5f353e96e2393b8bdfc495a3b426a.tar.bz2
gentoo-4c8cfd8a97c5f353e96e2393b8bdfc495a3b426a.zip
media-sound/herrie: respect PKG_CONFIG
Signed-off-by: Sam James <sam@gentoo.org>
-rw-r--r--media-sound/herrie/files/herrie-2.2-fix-buildsystem.patch14
-rw-r--r--media-sound/herrie/herrie-2.2-r1.ebuild2
2 files changed, 9 insertions, 7 deletions
diff --git a/media-sound/herrie/files/herrie-2.2-fix-buildsystem.patch b/media-sound/herrie/files/herrie-2.2-fix-buildsystem.patch
index 03a2c7397da..ce01e5c0c6e 100644
--- a/media-sound/herrie/files/herrie-2.2-fix-buildsystem.patch
+++ b/media-sound/herrie/files/herrie-2.2-fix-buildsystem.patch
@@ -3,19 +3,19 @@ Fix ncurses underlinking by using the pkg-config output instead of assuming
directive. See also:
https://bugs.gentoo.org/show_bug.cgi?id=573522
---- herrie-2.2/configure
-+++ herrie-2.2/configure
+--- a/configure
++++ b/configure
@@ -215,7 +215,7 @@
exit 1
fi
CFLAGS_main="-DAUDIO_OUTPUT=\\\"$CFG_AO\\\" -DCONFFILE=\\\"$CONFFILE\\\""
-LDFLAGS="$LDFLAGS -L$PREFIX/lib -l$CFG_CURSES_LIB"
-+LDFLAGS="$LDFLAGS -L$PREFIX/lib `pkg-config --libs $CFG_CURSES_LIB`"
++LDFLAGS="$LDFLAGS -L$PREFIX/lib `${PKG_CONFIG} --libs $CFG_CURSES_LIB`"
SRCS="audio_file audio_output_$CFG_AO config gui_browser gui_draw \
gui_input gui_msgbar gui_playq gui_vfslist main playq playq_party \
playq_xmms vfs vfs_playlist vfs_regular"
---- herrie-2.2/src/audio_format_modplug.c
-+++ herrie-2.2/src/audio_format_modplug.c
+--- a/src/audio_format_modplug.c
++++ b/src/audio_format_modplug.c
@@ -31,7 +31,7 @@
#include "stdinc.h"
@@ -25,8 +25,8 @@ https://bugs.gentoo.org/show_bug.cgi?id=573522
#include "audio_file.h"
#include "audio_format.h"
---- herrie-2.2/src/main.c
-+++ herrie-2.2/src/main.c
+--- a/src/main.c
++++ b/src/main.c
@@ -165,7 +165,7 @@
#endif /* CLOSE_STDERR */
if ((errmsg = vfs_lockup()) != NULL) {
diff --git a/media-sound/herrie/herrie-2.2-r1.ebuild b/media-sound/herrie/herrie-2.2-r1.ebuild
index 96a0ef4900b..d50e37ef867 100644
--- a/media-sound/herrie/herrie-2.2-r1.ebuild
+++ b/media-sound/herrie/herrie-2.2-r1.ebuild
@@ -52,6 +52,8 @@ src_configure() {
use vorbis || EXTRA_CONF="${EXTRA_CONF} no_vorbis"
use xspf || EXTRA_CONF="${EXTRA_CONF} no_xspf"
+ tc-export PKG_CONFIG
+
einfo "./configure ${EXTRA_CONF}"
CC="$(tc-getCC)" PREFIX=/usr MANDIR=/usr/share/man \
./configure ${EXTRA_CONF} || die "configure failed"