summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim A. Misbakh-Soloviov <mva@mva.name>2014-06-16 22:32:13 +0700
committerVadim A. Misbakh-Soloviov <mva@mva.name>2014-06-16 22:32:30 +0700
commit976a6ef0f7a684ed1f97d0dfef3399225073868e (patch)
tree7a94930b060865930419513dc3526e6096adf360 /dev-lua/luasec
parent[dev-lang/luajit] Bump to 2.0.3 (diff)
downloadlua-976a6ef0f7a684ed1f97d0dfef3399225073868e.tar.gz
lua-976a6ef0f7a684ed1f97d0dfef3399225073868e.tar.bz2
lua-976a6ef0f7a684ed1f97d0dfef3399225073868e.zip
[dev-lua/luasec] fixed DESTDIR (by temp. patch)
Signed-off-by: Vadim A. Misbakh-Soloviov <mva@mva.name>
Diffstat (limited to 'dev-lua/luasec')
-rw-r--r--dev-lua/luasec/files/fix_removed_destdir_support.patch17
-rw-r--r--dev-lua/luasec/luasec-9999.ebuild11
2 files changed, 26 insertions, 2 deletions
diff --git a/dev-lua/luasec/files/fix_removed_destdir_support.patch b/dev-lua/luasec/files/fix_removed_destdir_support.patch
new file mode 100644
index 0000000..5dc4882
--- /dev/null
+++ b/dev-lua/luasec/files/fix_removed_destdir_support.patch
@@ -0,0 +1,17 @@
+--- src/Makefile 2014-06-16 14:24:14.653000000 +0400
++++ src/Makefile 2014-06-16 14:23:14.250000000 +0400
+@@ -31,10 +31,10 @@
+ all:
+
+ install: $(CMOD) $(LMOD)
+- $(INSTALL) -d $(LUAPATH)/ssl $(LUACPATH)
+- $(INSTALL) $(CMOD) $(LUACPATH)
+- $(INSTALL) -m644 $(LMOD) $(LUAPATH)
+- $(INSTALL) -m644 https.lua $(LUAPATH)/ssl
++ $(INSTALL) -d $(DESTDIR)$(LUAPATH)/ssl $(DESTDIR)$(LUACPATH)
++ $(INSTALL) $(CMOD) $(DESTDIR)$(LUACPATH)
++ $(INSTALL) -m644 $(LMOD) $(DESTDIR)$(LUAPATH)
++ $(INSTALL) -m644 https.lua $(DESTDIR)$(LUAPATH)/ssl
+
+ linux:
+ @$(MAKE) $(CMOD) MYCFLAGS="$(LNX_CFLAGS)" MYLDFLAGS="$(LNX_LDFLAGS)" EXTRA="$(EXTRA)"
diff --git a/dev-lua/luasec/luasec-9999.ebuild b/dev-lua/luasec/luasec-9999.ebuild
index 77d6c2b..e08896a 100644
--- a/dev-lua/luasec/luasec-9999.ebuild
+++ b/dev-lua/luasec/luasec-9999.ebuild
@@ -18,13 +18,20 @@ KEYWORDS=""
IUSE="luajit"
RDEPEND="
- || ( >=dev-lang/lua-5.1[deprecated] dev-lang/luajit:2 )
+ !luajit? ( >=dev-lang/lua-5.1[deprecated] )
+ luajit? ( dev-lang/luajit:2 )
dev-lua/luasocket
dev-libs/openssl
"
DEPEND="
${RDEPEND}
- dev-util/pkgconfig"
+ dev-util/pkgconfig
+"
+
+
+src_prepare() {
+ epatch "${FILESDIR}/fix_removed_destdir_support.patch" || die "Probably, Upstream finally returned DESTDIR instalation back. Please, report that."
+}
src_compile() {
local lua=lua;