| 1 |
commit: b25325fe5cfcf23d50416d0ddbaa405bdc52a3b2 |
| 2 |
Author: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name> |
| 3 |
AuthorDate: Wed May 22 20:57:34 2013 +0000 |
| 4 |
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name> |
| 5 |
CommitDate: Wed May 22 20:57:34 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/lua.git;a=commit;h=b25325fe |
| 7 |
|
| 8 |
[dev-lua/*] LuaJIT compatibility staff (with upstream fixes) |
| 9 |
|
| 10 |
Signed-off-by: Vadim A. Misbakh-Soloviov <mva <AT> mva.name> |
| 11 |
|
| 12 |
--- |
| 13 |
dev-lua/coxpcall/coxpcall-9999.ebuild | 9 ++-- |
| 14 |
dev-lua/lua-iconv/lua-iconv-9999.ebuild | 11 +++-- |
| 15 |
dev-lua/luadbi/files/9999-Makefile.patch | 39 ----------------- |
| 16 |
dev-lua/luadbi/files/9999-postgres-path.patch | 9 ---- |
| 17 |
dev-lua/luadbi/luadbi-9999.ebuild | 32 +++++++------- |
| 18 |
dev-lua/luaevent/luaevent-9999.ebuild | 12 +++-- |
| 19 |
.../luaexpat/files/luaexpat-9999-makefile.patch | 2 +- |
| 20 |
dev-lua/luaexpat/luaexpat-9999.ebuild | 45 ++++++++++--------- |
| 21 |
dev-lua/luasec/files/luasec-9999_Makefile.patch | 17 ------- |
| 22 |
dev-lua/luasec/luasec-9999.ebuild | 35 ++++++++------- |
| 23 |
dev-lua/luasocket/luasocket-9999.ebuild | 25 ++++++----- |
| 24 |
11 files changed, 93 insertions(+), 143 deletions(-) |
| 25 |
|
| 26 |
diff --git a/dev-lua/coxpcall/coxpcall-9999.ebuild b/dev-lua/coxpcall/coxpcall-9999.ebuild |
| 27 |
index b23ec42..0bcf133 100644 |
| 28 |
--- a/dev-lua/coxpcall/coxpcall-9999.ebuild |
| 29 |
+++ b/dev-lua/coxpcall/coxpcall-9999.ebuild |
| 30 |
@@ -16,17 +16,18 @@ EGIT_REPO_URI="git://github.com/msva/coxpcall.git https://github.com/msva/coxpca |
| 31 |
LICENSE="MIT" |
| 32 |
SLOT="0" |
| 33 |
KEYWORDS="" |
| 34 |
-IUSE="doc" |
| 35 |
+IUSE="doc luajit" |
| 36 |
|
| 37 |
RDEPEND=" || ( >=dev-lang/lua-5.1 dev-lang/luajit:2 )" |
| 38 |
DEPEND="${RDEPEND}" |
| 39 |
|
| 40 |
src_configure() { |
| 41 |
- LUA="lua"; |
| 42 |
- ./configure "${LUA}" |
| 43 |
+ local lua="lua"; |
| 44 |
+ use luajit && lua="luajit"; |
| 45 |
+ ./configure "${lua}" |
| 46 |
} |
| 47 |
|
| 48 |
src_install() { |
| 49 |
emake DESTDIR="${D}" install |
| 50 |
- use doc && emake DESTDIR="${D}" install-doc |
| 51 |
+ use doc && emake DESTDIR="${D}" DOC_PREFIX=/usr/share/doc/${PF}/ install-doc |
| 52 |
} |
| 53 |
|
| 54 |
diff --git a/dev-lua/lua-iconv/lua-iconv-9999.ebuild b/dev-lua/lua-iconv/lua-iconv-9999.ebuild |
| 55 |
index 1c2630b..f0c7820 100644 |
| 56 |
--- a/dev-lua/lua-iconv/lua-iconv-9999.ebuild |
| 57 |
+++ b/dev-lua/lua-iconv/lua-iconv-9999.ebuild |
| 58 |
@@ -15,7 +15,7 @@ EGIT_REPO_URI="git://github.com/ittner/lua-iconv.git" |
| 59 |
LICENSE="MIT" |
| 60 |
SLOT="0" |
| 61 |
KEYWORDS="" |
| 62 |
-IUSE="" |
| 63 |
+IUSE="luajit" |
| 64 |
|
| 65 |
RDEPEND="|| ( >=dev-lang/lua-5.1 dev-lang/luajit:2 )" |
| 66 |
DEPEND="${RDEPEND} |
| 67 |
@@ -28,10 +28,13 @@ src_prepare() { |
| 68 |
} |
| 69 |
|
| 70 |
src_compile() { |
| 71 |
- use amd64 && CFLAGS="${CFLAGS} -fPIC" |
| 72 |
- emake CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS} -shared" || die "Can't compile" |
| 73 |
+ local lua=lua; |
| 74 |
+ use luajit && lua=luajit; |
| 75 |
+ emake LUAPKG="${lua}" || die "Can't compile" |
| 76 |
} |
| 77 |
|
| 78 |
src_install() { |
| 79 |
- emake DESTDIR="${D}" INSTALL_PATH="$($(tc-getPKG_CONFIG) lua --variable INSTALL_CMOD)" install || die "Can't install" |
| 80 |
+ local lua=lua; |
| 81 |
+ use luajit && lua=luajit; |
| 82 |
+ emake DESTDIR="${D}" INSTALL_PATH="$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD ${lua})" install || die "Can't install" |
| 83 |
} |
| 84 |
\ No newline at end of file |
| 85 |
|
| 86 |
diff --git a/dev-lua/luadbi/files/9999-Makefile.patch b/dev-lua/luadbi/files/9999-Makefile.patch |
| 87 |
deleted file mode 100644 |
| 88 |
index 5e0db85..0000000 |
| 89 |
--- a/dev-lua/luadbi/files/9999-Makefile.patch |
| 90 |
+++ /dev/null |
| 91 |
@@ -1,39 +0,0 @@ |
| 92 |
---- Makefile.old 2010-07-16 08:22:13.000000000 +0200 |
| 93 |
-+++ Makefile 2011-01-08 11:35:16.000000000 +0100 |
| 94 |
-@@ -27,6 +27,14 @@ |
| 95 |
- DB2_OBJS=$(OBJS) build/dbd_db2_main.o build/dbd_db2_connection.o build/dbd_db2_statement.o |
| 96 |
- ORACLE_OBJS=$(OBJS) build/dbd_oracle_main.o build/dbd_oracle_connection.o build/dbd_oracle_statement.o |
| 97 |
- |
| 98 |
-+INSTALL = install |
| 99 |
-+INSTALL_PROGRAM = $(INSTALL) |
| 100 |
-+INSTALL_DATA = $(INSTALL) -m 644 |
| 101 |
-+LUA_INC_DIR=/usr/include |
| 102 |
-+LUA_LIB_DIR=/usr/lib |
| 103 |
-+INSTALL_DIR_LUA=/usr/share/lua/5.1 |
| 104 |
-+INSTALL_DIR_BIN=/usr/lib/lua/5.1 |
| 105 |
-+ |
| 106 |
- free: mysql psql sqlite3 |
| 107 |
- |
| 108 |
- all: mysql psql sqlite3 db2 oracle |
| 109 |
-@@ -90,3 +98,21 @@ |
| 110 |
- build: |
| 111 |
- $(MKDIR) ${BUILDDIR} |
| 112 |
- |
| 113 |
-+install_lua: |
| 114 |
-+ $(INSTALL_DATA) -D DBI.lua $(DESTDIR)$(INSTALL_DIR_LUA)/DBI.lua |
| 115 |
-+ |
| 116 |
-+install_mysql: mysql install_lua |
| 117 |
-+ $(INSTALL_PROGRAM) -D $(DBDMYSQL) $(DESTDIR)$(INSTALL_DIR_BIN)/$(DBDMYSQL) |
| 118 |
-+ |
| 119 |
-+install_psql: psql install_lua |
| 120 |
-+ $(INSTALL_PROGRAM) -D $(DBDPSQL) $(DESTDIR)$(INSTALL_DIR_BIN)/$(DBDPSQL) |
| 121 |
-+ |
| 122 |
-+install_sqlite3: sqlite3 install_lua |
| 123 |
-+ $(INSTALL_PROGRAM) -D $(DBDSQLITE3) $(DESTDIR)$(INSTALL_DIR_BIN)/$(DBDSQLITE3) |
| 124 |
-+ |
| 125 |
-+install_db2: db2 install_lua |
| 126 |
-+ $(INSTALL_PROGRAM) -D $(DBDDB2) $(DESTDIR)$(INSTALL_DIR_BIN)/$(DBDDB2) |
| 127 |
-+ |
| 128 |
-+install_oracle: oracle install_lua |
| 129 |
-+ $(INSTALL_PROGRAM) -D $(DBDORACLE) $(DESTDIR)$(INSTALL_DIR_BIN)/$(DBDORACLE) |
| 130 |
-+ |
| 131 |
|
| 132 |
diff --git a/dev-lua/luadbi/files/9999-postgres-path.patch b/dev-lua/luadbi/files/9999-postgres-path.patch |
| 133 |
deleted file mode 100644 |
| 134 |
index 87a0e88..0000000 |
| 135 |
--- a/dev-lua/luadbi/files/9999-postgres-path.patch |
| 136 |
+++ /dev/null |
| 137 |
@@ -1,9 +0,0 @@ |
| 138 |
---- dbd/postgresql/dbd_postgresql.h.old 2010-05-01 06:25:12.000000000 +0200 |
| 139 |
-+++ dbd/postgresql/dbd_postgresql.h 2011-04-19 16:59:53.364944209 +0200 |
| 140 |
-@@ -1,5 +1,5 @@ |
| 141 |
- #include <libpq-fe.h> |
| 142 |
--#include <postgres_fe.h> |
| 143 |
-+#include <server/postgres_fe.h> |
| 144 |
- #include <dbd/common.h> |
| 145 |
- |
| 146 |
- /* |
| 147 |
\ No newline at end of file |
| 148 |
|
| 149 |
diff --git a/dev-lua/luadbi/luadbi-9999.ebuild b/dev-lua/luadbi/luadbi-9999.ebuild |
| 150 |
index d4b671e..00d5e7a 100644 |
| 151 |
--- a/dev-lua/luadbi/luadbi-9999.ebuild |
| 152 |
+++ b/dev-lua/luadbi/luadbi-9999.ebuild |
| 153 |
@@ -7,13 +7,14 @@ EAPI="5" |
| 154 |
inherit multilib toolchain-funcs flag-o-matic eutils mercurial |
| 155 |
|
| 156 |
DESCRIPTION="DBI module for Lua" |
| 157 |
-HOMEPAGE="http://code.matthewwild.co.uk/luadbi" |
| 158 |
-EHG_REPO_URI="http://code.matthewwild.co.uk/luadbi" |
| 159 |
+HOMEPAGE="https://code.google.com/p/luadbi" |
| 160 |
+#EHG_REPO_URI="https://code.google.com/p/luadbi" |
| 161 |
+EHG_REPO_URI="https://bitbucket.org/mva/luadbi-temp" |
| 162 |
|
| 163 |
LICENSE="MIT" |
| 164 |
SLOT="0" |
| 165 |
KEYWORDS="" |
| 166 |
-IUSE="mysql postgres sqlite" |
| 167 |
+IUSE="mysql postgres sqlite luajit" |
| 168 |
|
| 169 |
RDEPEND=" || ( >=dev-lang/lua-5.1 dev-lang/luajit:2 ) |
| 170 |
mysql? ( || ( dev-db/mysql dev-db/mariadb ) ) |
| 171 |
@@ -24,17 +25,10 @@ DEPEND="${RDEPEND} |
| 172 |
|
| 173 |
S="${WORKDIR}" |
| 174 |
|
| 175 |
-src_prepare() { |
| 176 |
- epatch "${FILESDIR}/${PV}-Makefile.patch" |
| 177 |
- epatch "${FILESDIR}/${PV}-postgres-path.patch" |
| 178 |
- sed -i -e "s#^INSTALL_DIR_LUA=.*#INSTALL_DIR_LUA=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)#" "${S}/Makefile" |
| 179 |
- sed -i -e "s#^INSTALL_DIR_BIN=.*#INSTALL_DIR_BIN=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)#" "${S}/Makefile" |
| 180 |
- sed -i -e "s#^LUA_INC_DIR=.*#LUA_INC_DIR=$($(tc-getPKG_CONFIG) --variable INSTALL_INC lua)#" "${S}/Makefile" |
| 181 |
- sed -i -e "s#^LUA_LIB_DIR=.*#LUA_LIB_DIR=$($(tc-getPKG_CONFIG) --variable INSTALL_LIB lua)#" "${S}/Makefile" |
| 182 |
- sed -i -e "s#^LUA_LIB =.*#LUA_LIB=lua#" "${S}/Makefile" |
| 183 |
-} |
| 184 |
- |
| 185 |
src_compile() { |
| 186 |
+ local lua=lua; |
| 187 |
+ use luajit && lua=luajit; |
| 188 |
+ |
| 189 |
local drivers="" |
| 190 |
use mysql && drivers="${drivers} mysql" |
| 191 |
use postgres && drivers="${drivers} psql" |
| 192 |
@@ -49,9 +43,17 @@ src_compile() { |
| 193 |
die "No driver selected" |
| 194 |
fi |
| 195 |
|
| 196 |
- append-flags -fPIC -c |
| 197 |
for driver in "${drivers}" ; do |
| 198 |
- emake ${driver} \ |
| 199 |
+ emake \ |
| 200 |
+ CC="$(tc-getCC) -fPIC -DPIC" \ |
| 201 |
+ LDFLAGS="${LDFLAGS}" \ |
| 202 |
+ CFLAGS="${CFLAGS}" \ |
| 203 |
+ LUA_LMOD="$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})" \ |
| 204 |
+ LUA_CMOD="$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD ${lua})" \ |
| 205 |
+ LUA_INC="-I$($(tc-getPKG_CONFIG) --variable INSTALL_INC ${lua})" \ |
| 206 |
+ PSQL_INC="-I/usr/include/postgresql/server" \ |
| 207 |
+ MYQL_INC="-I/usr/include/mysql" \ |
| 208 |
+ ${driver} \ |
| 209 |
|| die "Compiling driver '${drivers// /}' failed" |
| 210 |
done |
| 211 |
} |
| 212 |
|
| 213 |
diff --git a/dev-lua/luaevent/luaevent-9999.ebuild b/dev-lua/luaevent/luaevent-9999.ebuild |
| 214 |
index 1485ed2..0c5a548 100644 |
| 215 |
--- a/dev-lua/luaevent/luaevent-9999.ebuild |
| 216 |
+++ b/dev-lua/luaevent/luaevent-9999.ebuild |
| 217 |
@@ -8,12 +8,12 @@ inherit toolchain-funcs git-2 |
| 218 |
|
| 219 |
DESCRIPTION="libevent bindings for Lua" |
| 220 |
HOMEPAGE="http://luaforge.net/projects/luaevent http://repo.or.cz/w/luaevent.git" |
| 221 |
-EGIT_REPO_URI="git://github.com/harningt/luaevent.git" |
| 222 |
+EGIT_REPO_URI="https://github.com/harningt/luaevent git://github.com/harningt/luaevent.git" |
| 223 |
|
| 224 |
LICENSE="LGPL-2.1" |
| 225 |
SLOT="0" |
| 226 |
KEYWORDS="" |
| 227 |
-IUSE="" |
| 228 |
+IUSE="luajit" |
| 229 |
|
| 230 |
RDEPEND="|| ( >=dev-lang/lua-5.1 dev-lang/luajit:2 ) |
| 231 |
>=dev-libs/libevent-1.4" |
| 232 |
@@ -21,17 +21,19 @@ DEPEND="${RDEPEND} |
| 233 |
dev-util/pkgconfig" |
| 234 |
|
| 235 |
src_prepare() { |
| 236 |
+ local lua=lua; |
| 237 |
+ use luajit && lua=luajit; |
| 238 |
sed -i "s:^CFLAGS =:CFLAGS +=:" "${S}/Makefile" \ |
| 239 |
|| die "sed failed" |
| 240 |
sed -i "s:^LDFLAGS =:LDFLAGS +=:" "${S}/Makefile" \ |
| 241 |
|| die "sed failed" |
| 242 |
sed -i "/^LDFLAGS/a CC = $(tc-getCC)" "${S}/Makefile" \ |
| 243 |
|| die "sed failed" |
| 244 |
- sed -i "s:^LUA_INC_DIR ?=.*:LUA_INC_DIR ?= $($(tc-getPKG_CONFIG) --variable INSTALL_INC lua):" "${S}/Makefile" \ |
| 245 |
+ sed -i "s:^LUA_INC_DIR ?=.*:LUA_INC_DIR ?= $($(tc-getPKG_CONFIG) --variable INSTALL_INC ${lua}):" "${S}/Makefile" \ |
| 246 |
|| die "sed failed" |
| 247 |
- sed -i "s:^INSTALL_DIR_LUA ?=.*:INSTALL_DIR_LUA ?= $($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua):" "${S}/Makefile" \ |
| 248 |
+ sed -i "s:^INSTALL_DIR_LUA ?=.*:INSTALL_DIR_LUA ?= $($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua}):" "${S}/Makefile" \ |
| 249 |
|| die "sed failed" |
| 250 |
- sed -i "s:^INSTALL_DIR_BIN ?=.*:INSTALL_DIR_BIN ?= $($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua):" "${S}/Makefile" \ |
| 251 |
+ sed -i "s:^INSTALL_DIR_BIN ?=.*:INSTALL_DIR_BIN ?= $($(tc-getPKG_CONFIG) --variable INSTALL_CMOD ${lua}):" "${S}/Makefile" \ |
| 252 |
|| die "sed failed" |
| 253 |
} |
| 254 |
|
| 255 |
|
| 256 |
diff --git a/dev-lua/luaexpat/files/luaexpat-9999-makefile.patch b/dev-lua/luaexpat/files/luaexpat-9999-makefile.patch |
| 257 |
index b503a4e..227fd06 100644 |
| 258 |
--- a/dev-lua/luaexpat/files/luaexpat-9999-makefile.patch |
| 259 |
+++ b/dev-lua/luaexpat/files/luaexpat-9999-makefile.patch |
| 260 |
@@ -11,7 +11,7 @@ |
| 261 |
- cp src/$T/lom.lua $(LUA_DIR)/$T |
| 262 |
+ mkdir -p $(DESTDIR)$(LUA_LIBDIR) |
| 263 |
+ cp src/$(LIBNAME) $(DESTDIR)$(LUA_LIBDIR) |
| 264 |
-+ cd $(DESTDIR)$(LUA_LIBDIR); ln -f -s $(LIBNAME) $T.so |
| 265 |
++ cd $(DESTDIR)$(LUA_LIBDIR) |
| 266 |
+ mkdir -p $(DESTDIR)$(LUA_DIR)/$T |
| 267 |
+ cp src/$T/lom.lua $(DESTDIR)$(LUA_DIR)/$T |
| 268 |
|
| 269 |
|
| 270 |
diff --git a/dev-lua/luaexpat/luaexpat-9999.ebuild b/dev-lua/luaexpat/luaexpat-9999.ebuild |
| 271 |
index 2755d86..bb1980c 100644 |
| 272 |
--- a/dev-lua/luaexpat/luaexpat-9999.ebuild |
| 273 |
+++ b/dev-lua/luaexpat/luaexpat-9999.ebuild |
| 274 |
@@ -4,43 +4,46 @@ |
| 275 |
|
| 276 |
EAPI="5" |
| 277 |
|
| 278 |
-inherit multilib toolchain-funcs flag-o-matic mercurial eutils |
| 279 |
+inherit multilib toolchain-funcs mercurial eutils |
| 280 |
|
| 281 |
DESCRIPTION="XMPP client library written in Lua." |
| 282 |
HOMEPAGE="http://code.mathewwild.co.uk/" |
| 283 |
EHG_REPO_URI="http://code.matthewwild.co.uk/lua-expat/" |
| 284 |
+#EHG_REPO_URI="https://bitbucket.org/mva/luaexpat-temp" |
| 285 |
|
| 286 |
LICENSE="MIT" |
| 287 |
SLOT="0" |
| 288 |
KEYWORDS="" |
| 289 |
-IUSE="" |
| 290 |
+IUSE="luajit" |
| 291 |
|
| 292 |
-RDEPEND="|| ( >=dev-lang/lua-5.1 dev-lang/luajit:2 ) |
| 293 |
- dev-libs/expat" |
| 294 |
-DEPEND="${RDEPEND} |
| 295 |
-dev-util/pkgconfig" |
| 296 |
- |
| 297 |
-src_prepare() { |
| 298 |
- sed -i -e "s#^LUA_LIBDIR=.*#LUA_LIBDIR=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)#" "${S}/config" |
| 299 |
- sed -i -e "s#^LUA_DIR=.*#LUA_DIR=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)#" "${S}/config" |
| 300 |
- sed -i -e "s#^LUA_INC=.*#LUA_INC=$($(tc-getPKG_CONFIG) --variable INSTALL_INC lua)#" "${S}/config" |
| 301 |
- sed -i -e "s#^EXPAT_INC=.*#EXPAT_INC=/usr/include#" "${S}/config" |
| 302 |
- sed -i -e "s#^LUA_VERSION_NUM=.*#LUA_VERSION_NUM=501#" "${S}/config" |
| 303 |
- epatch "${FILESDIR}/${P}-makefile.patch" |
| 304 |
-} |
| 305 |
+RDEPEND=" |
| 306 |
+ || ( >=dev-lang/lua-5.1 dev-lang/luajit:2 ) |
| 307 |
+ dev-libs/expat |
| 308 |
+" |
| 309 |
+DEPEND=" |
| 310 |
+ ${RDEPEND} |
| 311 |
+ dev-util/pkgconfig |
| 312 |
+" |
| 313 |
|
| 314 |
src_compile() { |
| 315 |
- append-flags -fPIC |
| 316 |
+ local lua=lua; |
| 317 |
+ use luajit && lua=luajit |
| 318 |
emake \ |
| 319 |
- CFLAGS="${CFLAGS}" \ |
| 320 |
- LDFLAGS="${LDFLAGS}" \ |
| 321 |
CC="$(tc-getCC)" \ |
| 322 |
- LD="$(tc-getCC) -shared" \ |
| 323 |
- || die |
| 324 |
+ LDFLAGS="${LDFLAGS}" \ |
| 325 |
+ CFLAGS="${CFLAGS}" \ |
| 326 |
+ LUA_INC="-I$($(tc-getPKG_CONFIG) --variable INSTALL_INC ${lua})" || die "Compiling failed"} |
| 327 |
} |
| 328 |
|
| 329 |
src_install() { |
| 330 |
- make DESTDIR="${D}" install || die "Install failed" |
| 331 |
+ local lua=lua; |
| 332 |
+ use luajit && lua=luajit |
| 333 |
+ emake \ |
| 334 |
+ LUA_LMOD="$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})" \ |
| 335 |
+ LUA_CMOD="$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD ${lua})" \ |
| 336 |
+ DESTDIR="${D}" \ |
| 337 |
+ install || die "Install failed" |
| 338 |
dodoc README || die |
| 339 |
+ docompress -x "/usr/share/doc/${PF}/html" |
| 340 |
dohtml -r doc/* || die |
| 341 |
} |
| 342 |
|
| 343 |
diff --git a/dev-lua/luasec/files/luasec-9999_Makefile.patch b/dev-lua/luasec/files/luasec-9999_Makefile.patch |
| 344 |
deleted file mode 100644 |
| 345 |
index 02d5247..0000000 |
| 346 |
--- a/dev-lua/luasec/files/luasec-9999_Makefile.patch |
| 347 |
+++ /dev/null |
| 348 |
@@ -1,17 +0,0 @@ |
| 349 |
---- src/Makefile.old 2009-10-15 12:59:54.000000000 +0000 |
| 350 |
-+++ src/Makefile 2009-10-26 14:29:26.000000000 +0000 |
| 351 |
-@@ -33,10 +33,10 @@ |
| 352 |
- all: |
| 353 |
- |
| 354 |
- install: $(CMOD) $(LMOD) |
| 355 |
-- mkdir -p $(LUAPATH)/ssl |
| 356 |
-- cp $(CMOD) $(LUACPATH) |
| 357 |
-- cp $(LMOD) $(LUAPATH) |
| 358 |
-- cp https.lua $(LUAPATH)/ssl |
| 359 |
-+ mkdir -p $(DESTDIR)$(LUAPATH)/ssl $(DESTDIR)$(LUACPATH) |
| 360 |
-+ cp $(CMOD) $(DESTDIR)$(LUACPATH) |
| 361 |
-+ cp $(LMOD) $(DESTDIR)$(LUAPATH) |
| 362 |
-+ cp https.lua $(DESTDIR)$(LUAPATH)/ssl |
| 363 |
- |
| 364 |
- linux: |
| 365 |
- @$(MAKE) $(CMOD) MYCFLAGS="$(LNX_CFLAGS)" MYLDFLAGS="$(LNX_LDFLAGS)" |
| 366 |
|
| 367 |
diff --git a/dev-lua/luasec/luasec-9999.ebuild b/dev-lua/luasec/luasec-9999.ebuild |
| 368 |
index 130ed4b..dca3e06 100644 |
| 369 |
--- a/dev-lua/luasec/luasec-9999.ebuild |
| 370 |
+++ b/dev-lua/luasec/luasec-9999.ebuild |
| 371 |
@@ -4,36 +4,37 @@ |
| 372 |
|
| 373 |
EAPI="5" |
| 374 |
|
| 375 |
-inherit multilib toolchain-funcs flag-o-matic mercurial eutils |
| 376 |
+inherit multilib toolchain-funcs eutils git-2 |
| 377 |
|
| 378 |
DESCRIPTION="Lua binding for OpenSSL library to provide TLS/SSL communication." |
| 379 |
HOMEPAGE="http://www.inf.puc-rio.br/~brunoos/luasec/" |
| 380 |
-EHG_REPO_URI="http://code.matthewwild.co.uk/luasec-hg" |
| 381 |
+#EGIT_REPO_URI="https://github.com/msva/luasec" |
| 382 |
+EGIT_REPO_URI="https://github.com/mwild1/luasec" |
| 383 |
+#EGIT_REPO_URI="https://github.com/brunoos/luasec" |
| 384 |
|
| 385 |
LICENSE="MIT" |
| 386 |
SLOT="0" |
| 387 |
KEYWORDS="" |
| 388 |
-IUSE="" |
| 389 |
- |
| 390 |
-RDEPEND="|| ( >=dev-lang/lua-5.1[deprecated] dev-lang/luajit:2 ) |
| 391 |
- dev-lua/luasocket |
| 392 |
- dev-libs/openssl" |
| 393 |
-DEPEND="${RDEPEND} |
| 394 |
+IUSE="luajit" |
| 395 |
+ |
| 396 |
+RDEPEND=" |
| 397 |
+ || ( >=dev-lang/lua-5.1[deprecated] dev-lang/luajit:2 ) |
| 398 |
+ dev-lua/luasocket |
| 399 |
+ dev-libs/openssl |
| 400 |
+" |
| 401 |
+DEPEND=" |
| 402 |
+ ${RDEPEND} |
| 403 |
dev-util/pkgconfig" |
| 404 |
|
| 405 |
-src_prepare() { |
| 406 |
- sed -i -e "s#^LUAPATH=.*#LUAPATH=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)#" "${S}/Makefile" |
| 407 |
- sed -i -e "s#^LUACPATH=.*#LUACPATH=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)#" "${S}/Makefile" |
| 408 |
- epatch "${FILESDIR}/${P}_Makefile.patch" |
| 409 |
-} |
| 410 |
- |
| 411 |
src_compile() { |
| 412 |
- append-flags -fPIC |
| 413 |
+ local lua=lua; |
| 414 |
+ use luajit && lua=luajit; |
| 415 |
emake \ |
| 416 |
- CFLAGS="${CFLAGS}" \ |
| 417 |
- LDFLAGS="${LDFLAGS}" \ |
| 418 |
CC="$(tc-getCC)" \ |
| 419 |
LD="$(tc-getCC) -shared" \ |
| 420 |
+ LUAPATH="$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})" \ |
| 421 |
+ LUACPATH="$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD ${lua})" \ |
| 422 |
+ INC_PATH="-I$($(tc-getPKG_CONFIG) --variable includedir ${lua})" \ |
| 423 |
linux \ |
| 424 |
|| die |
| 425 |
} |
| 426 |
|
| 427 |
diff --git a/dev-lua/luasocket/luasocket-9999.ebuild b/dev-lua/luasocket/luasocket-9999.ebuild |
| 428 |
index fb92e74..bfb6a36 100644 |
| 429 |
--- a/dev-lua/luasocket/luasocket-9999.ebuild |
| 430 |
+++ b/dev-lua/luasocket/luasocket-9999.ebuild |
| 431 |
@@ -21,24 +21,27 @@ RDEPEND="|| ( >=dev-lang/lua-5.1 dev-lang/luajit:2 )" |
| 432 |
DEPEND="${RDEPEND} |
| 433 |
dev-util/pkgconfig" |
| 434 |
|
| 435 |
-src_configure() { |
| 436 |
+src_compile() { |
| 437 |
+ local inc=/usr/include |
| 438 |
+ use luajit && inc=/usr/include/luajit-2.0 |
| 439 |
+ |
| 440 |
use debug && export DEBUG="DEBUG" |
| 441 |
- prefix=/usr |
| 442 |
- LUAINC_linux=/usr/include |
| 443 |
- use luajit && LUAINC_linux=/usr/include/luajit-2.0 |
| 444 |
- LUALIB_linux=/usr/lib |
| 445 |
-} |
| 446 |
|
| 447 |
-src_compile() { |
| 448 |
emake linux \ |
| 449 |
- CC="$(tc-getCC)" \ |
| 450 |
- LD="$(tc-getCC) -shared" || die |
| 451 |
+ prefix=/usr \ |
| 452 |
+ LUAINC_linux="${inc}" \ |
| 453 |
+ LUALIB_linux=/usr/lib \ |
| 454 |
+ CC="$(tc-getCC)" \ |
| 455 |
+ LD="$(tc-getCC) -shared" \ |
| 456 |
+ || die |
| 457 |
} |
| 458 |
|
| 459 |
src_install() { |
| 460 |
+ local lua=lua; |
| 461 |
+ use luajit && lua=luajit; |
| 462 |
emake install \ |
| 463 |
- INSTALL_TOP_SHARE="${D}/$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)" \ |
| 464 |
- INSTALL_TOP_LIB="${D}/$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua | sed -e "s:lib/:$(get_libdir)/:")" || die |
| 465 |
+ INSTALL_TOP_SHARE="${D}/$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})" \ |
| 466 |
+ INSTALL_TOP_LIB="${D}/$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD ${lua} | sed -e "s:lib/:$(get_libdir)/:")" || die |
| 467 |
|
| 468 |
dodoc NEW README || die |
| 469 |
dohtml doc/* || die |
Archives