commit:     52d57339a18d20c00421f235006ba65e0a4248e0
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 15 23:19:13 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sun Mar 15 23:22:04 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52d57339

dev-lua/lua-utf8: QA: quoting, respect LDFLAGS and CC, fix tests

Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 dev-lua/lua-utf8/files/lua-utf8.Makefile | 3 ++-
 dev-lua/lua-utf8/lua-utf8-0.1.1.ebuild   | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/dev-lua/lua-utf8/files/lua-utf8.Makefile 
b/dev-lua/lua-utf8/files/lua-utf8.Makefile
index ebbaecefea6..456c52f4aaa 100644
--- a/dev-lua/lua-utf8/files/lua-utf8.Makefile
+++ b/dev-lua/lua-utf8/files/lua-utf8.Makefile
@@ -11,6 +11,7 @@ LUA_SHARE       := $(shell $(PKG_CONFIG) --variable 
INSTALL_LMOD $(MY_USE_LUA))
 CWARNS          := -Wall -pedantic
 CFLAGS          += -I$(LUA_INC) -fPIC $(CWARNS)
 LIB_OPTION      := -shared
+LDFLAGS         += $(LIB_OPTION)
 
 SONAME          := lua-utf8.so
 SONAMEV         := $(SONAME).0
@@ -29,7 +30,7 @@ $(SONAME):
        ln -s $(SONAMEV) $@
 
 $(LIBRARY): $(OBJ)
-       $(CC) $(CFLAGS) $(LIB_OPTION) -o $(LIBRARY) $(OBJ) -lc
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $(LIBRARY) $(OBJ) -lc
 
 install:
        install -d $(DESTDIR)$(LUA_LIBDIR)

diff --git a/dev-lua/lua-utf8/lua-utf8-0.1.1.ebuild 
b/dev-lua/lua-utf8/lua-utf8-0.1.1.ebuild
index 00f5147b88b..7daf5890116 100644
--- a/dev-lua/lua-utf8/lua-utf8-0.1.1.ebuild
+++ b/dev-lua/lua-utf8/lua-utf8-0.1.1.ebuild
@@ -26,10 +26,11 @@ S="${WORKDIR}/${PN//-/}-${PV}"
 src_prepare() {
        default
 
-       cp -v ${FILESDIR}/${PN}.Makefile ${S}/Makefile || die
+       cp -v "${FILESDIR}/${PN}".Makefile "${S}"/Makefile || die
 }
 
 src_compile() {
+       tc-export CC
        emake DESTDIR="${D}" PREFIX="${EPREFIX}" MY_USE_LUA="$(usex luajit 
'luajit' 'lua')" PKG_CONFIG="$(tc-getPKG_CONFIG)"
 }
 
@@ -39,5 +40,5 @@ src_install() {
 }
 
 src_test() {
-       LUA_CPATH=./src/?.so $(usex luajit 'luajit' 'lua') test.lua || die
+       LUA_CPATH=./?.so $(usex luajit 'luajit' 'lua') test.lua || die
 }

Reply via email to