| 1 |
commit: b21a82486b987cdae04b77b62c517ffc169412b9 |
| 2 |
Author: Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name> |
| 3 |
AuthorDate: Fri Aug 5 22:17:54 2016 +0000 |
| 4 |
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name> |
| 5 |
CommitDate: Fri Aug 5 22:17:54 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/lua.git/commit/?id=b21a8248 |
| 7 |
|
| 8 |
luasec: fixed build after upstream merged DESTDIR back |
| 9 |
|
| 10 |
dev-lua/luasec/files/fix_removed_destdir_support.patch | 17 ----------------- |
| 11 |
dev-lua/luasec/luasec-9999.ebuild | 18 ++++++++---------- |
| 12 |
2 files changed, 8 insertions(+), 27 deletions(-) |
| 13 |
|
| 14 |
diff --git a/dev-lua/luasec/files/fix_removed_destdir_support.patch b/dev-lua/luasec/files/fix_removed_destdir_support.patch |
| 15 |
deleted file mode 100644 |
| 16 |
index 5dc4882..0000000 |
| 17 |
--- a/dev-lua/luasec/files/fix_removed_destdir_support.patch |
| 18 |
+++ /dev/null |
| 19 |
@@ -1,17 +0,0 @@ |
| 20 |
---- src/Makefile 2014-06-16 14:24:14.653000000 +0400 |
| 21 |
-+++ src/Makefile 2014-06-16 14:23:14.250000000 +0400 |
| 22 |
-@@ -31,10 +31,10 @@ |
| 23 |
- all: |
| 24 |
- |
| 25 |
- install: $(CMOD) $(LMOD) |
| 26 |
-- $(INSTALL) -d $(LUAPATH)/ssl $(LUACPATH) |
| 27 |
-- $(INSTALL) $(CMOD) $(LUACPATH) |
| 28 |
-- $(INSTALL) -m644 $(LMOD) $(LUAPATH) |
| 29 |
-- $(INSTALL) -m644 https.lua $(LUAPATH)/ssl |
| 30 |
-+ $(INSTALL) -d $(DESTDIR)$(LUAPATH)/ssl $(DESTDIR)$(LUACPATH) |
| 31 |
-+ $(INSTALL) $(CMOD) $(DESTDIR)$(LUACPATH) |
| 32 |
-+ $(INSTALL) -m644 $(LMOD) $(DESTDIR)$(LUAPATH) |
| 33 |
-+ $(INSTALL) -m644 https.lua $(DESTDIR)$(LUAPATH)/ssl |
| 34 |
- |
| 35 |
- linux: |
| 36 |
- @$(MAKE) $(CMOD) MYCFLAGS="$(LNX_CFLAGS)" MYLDFLAGS="$(LNX_LDFLAGS)" EXTRA="$(EXTRA)" |
| 37 |
|
| 38 |
diff --git a/dev-lua/luasec/luasec-9999.ebuild b/dev-lua/luasec/luasec-9999.ebuild |
| 39 |
index d99ce75..9021460 100644 |
| 40 |
--- a/dev-lua/luasec/luasec-9999.ebuild |
| 41 |
+++ b/dev-lua/luasec/luasec-9999.ebuild |
| 42 |
@@ -28,29 +28,27 @@ DEPEND=" |
| 43 |
all_lua_prepare() { |
| 44 |
sed -i -r \ |
| 45 |
-e 's#(MAKE\)).*(install)#\1 \2#' \ |
| 46 |
+ -e '/LIB_PATH.*-L.usr.lib/d' \ |
| 47 |
Makefile |
| 48 |
- epatch "${FILESDIR}/fix_removed_destdir_support.patch" || die "Probably, Upstream finally returned DESTDIR instalation back. Please, report that." |
| 49 |
- cd src |
| 50 |
+ |
| 51 |
+ pushd src &>/dev/null |
| 52 |
lua_default |
| 53 |
+ popd &>/dev/null |
| 54 |
} |
| 55 |
|
| 56 |
each_lua_configure() { |
| 57 |
- cd src |
| 58 |
+ pushd src &>/dev/null |
| 59 |
myeconfargs=() |
| 60 |
myeconfargs+=( |
| 61 |
LD='$(CC)' |
| 62 |
LUAPATH="$(lua_get_pkgvar INSTALL_LMOD)" |
| 63 |
LUACPATH="$(lua_get_pkgvar INSTALL_CMOD)" |
| 64 |
) |
| 65 |
- lua_default |
| 66 |
+ |
| 67 |
+ lua_default |
| 68 |
+ popd &>/dev/null |
| 69 |
} |
| 70 |
|
| 71 |
each_lua_compile() { |
| 72 |
lua_default linux |
| 73 |
} |
| 74 |
- |
| 75 |
-#each_lua_install() { |
| 76 |
-# dolua ssl.so ssl.lua |
| 77 |
-# _dolua_insdir=ssl \ |
| 78 |
-# dolua https.lua |
| 79 |
-#} |
Archives