summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2021-04-19 08:59:41 +0100
committerSam James <sam@gentoo.org>2021-04-19 20:10:47 +0100
commitf2d2b29394ad19fd675e43039af0264753dd3c8f (patch)
treeb03355e71846c3083e1716c7021c954b80c4f15f
parentapp-text/mupdf: tidy up patch (diff)
downloadgentoo-f2d2b29394ad19fd675e43039af0264753dd3c8f.tar.gz
gentoo-f2d2b29394ad19fd675e43039af0264753dd3c8f.tar.bz2
gentoo-f2d2b29394ad19fd675e43039af0264753dd3c8f.zip
dev-lua/lanes: respect PKG_CONFIG
Signed-off-by: Sam James <sam@gentoo.org>
-rw-r--r--dev-lua/lanes/files/lanes-3.13.0-makefile.patch12
-rw-r--r--dev-lua/lanes/lanes-3.13.0-r100.ebuild2
2 files changed, 8 insertions, 6 deletions
diff --git a/dev-lua/lanes/files/lanes-3.13.0-makefile.patch b/dev-lua/lanes/files/lanes-3.13.0-makefile.patch
index 257c9efca466..18d26d95e345 100644
--- a/dev-lua/lanes/files/lanes-3.13.0-makefile.patch
+++ b/dev-lua/lanes/files/lanes-3.13.0-makefile.patch
@@ -1,5 +1,5 @@
---- lanes-3.13.0.old/Makefile 2018-11-30 13:28:50.000000000 +0100
-+++ lanes-3.13.0/Makefile 2020-11-30 21:28:36.769384766 +0100
+--- a/Makefile
++++ b/Makefile
@@ -33,7 +33,7 @@
# Autodetect LUA
@@ -9,8 +9,8 @@
_TARGET_SO=$(_TARGET_DIR)/core.$(_SO)
---- lanes-3.13.0.old/src/Makefile 2018-11-30 13:28:50.000000000 +0100
-+++ lanes-3.13.0/src/Makefile 2020-11-30 21:40:06.399382894 +0100
+--- a/src/Makefile
++++ b/src/Makefile
@@ -15,7 +15,7 @@
#
LIBFLAG=-shared
@@ -68,8 +68,8 @@
- LUA_LIBS:=-llua
- endif
- endif
-+ LUA_FLAGS ?= $(shell pkg-config --cflags lua)
-+ LUA_LIBS ?= $(shell pkg-config --libs lua)
++ LUA_FLAGS ?= $(shell ${PKG_CONFIG} --cflags lua)
++ LUA_LIBS ?= $(shell ${PKG_CONFIG} --libs lua)
endif
ifeq "$(shell uname -s)" "Darwin"
diff --git a/dev-lua/lanes/lanes-3.13.0-r100.ebuild b/dev-lua/lanes/lanes-3.13.0-r100.ebuild
index ff53021e2973..d5cc81818eb9 100644
--- a/dev-lua/lanes/lanes-3.13.0-r100.ebuild
+++ b/dev-lua/lanes/lanes-3.13.0-r100.ebuild
@@ -46,6 +46,8 @@ lua_src_compile() {
"OPT_FLAGS=${CFLAGS}"
)
+ tc-export PKG_CONFIG
+
emake "${myemakeargs[@]}"
popd