diff options
| author |   Vadim A. Misbakh-Soloviov <git@mva.name> | 2017-05-10 17:15:04 +0700 |
|---|---|---|
| committer | Vadim A. Misbakh-Soloviov <git@mva.name> | 2017-05-10 17:15:04 +0700 |
| commit | 12c90379fd9eee754ccbf35fbcdf13caebcff832 (patch) | |
| tree | afca1688a784edd2abb6f1750867cd4a032f151b | |
| parent | lyaml: fix (diff) | |
| download | lua-12c90379fd9eee754ccbf35fbcdf13caebcff832.tar.gz lua-12c90379fd9eee754ccbf35fbcdf13caebcff832.tar.bz2 lua-12c90379fd9eee754ccbf35fbcdf13caebcff832.zip | |
luaossl: fix
| -rw-r--r-- | dev-lua/luaossl/files/patches/99999999/compat52-luajit.patch | 59 | ||||
| -rw-r--r-- | dev-lua/luaossl/files/patches/99999999/makefile.oscp.patch | 13 | ||||
| -rw-r--r-- | dev-lua/luaossl/luaossl-99999999.ebuild | 2 |
3 files changed, 74 insertions, 0 deletions
diff --git a/dev-lua/luaossl/files/patches/99999999/compat52-luajit.patch b/dev-lua/luaossl/files/patches/99999999/compat52-luajit.patch new file mode 100644 index 0000000..1da7c7a --- /dev/null +++ b/dev-lua/luaossl/files/patches/99999999/compat52-luajit.patch @@ -0,0 +1,59 @@ +diff -NaurBwd a/compat52.h b/compat52.h +--- a/src/compat52.h 2017-05-10 02:07:08.039072892 +0700 ++++ b/src/compat52.h 2017-05-10 02:06:55.224543285 +0700 +@@ -32,20 +32,19 @@ + + #if LUA_VERSION_NUM < 502 + +-#define LUA_OK 0 + +- ++#ifndef LUA_OK + static void luaL_setmetatable(lua_State *L, const char *tname) { + luaL_getmetatable(L, tname); + lua_setmetatable(L, -2); + } /* luaL_setmetatable() */ +- ++#endif + + static int lua_absindex(lua_State *L, int idx) { + return (idx > 0 || idx <= LUA_REGISTRYINDEX)? idx : lua_gettop(L) + idx + 1; + } /* lua_absindex() */ +- + ++#ifndef LUA_OK + static void *luaL_testudata(lua_State *L, int arg, const char *tname) { + void *p = lua_touserdata(L, arg); + int eq; +@@ -70,8 +69,10 @@ + + return (eq)? p : 0; + } /* luaL_testudate() */ ++#endif + + ++#ifndef LUA_OK + static void luaL_setfuncs(lua_State *L, const luaL_Reg *l, int nup) { + int i, t = lua_absindex(L, -1 - nup); + +@@ -84,13 +85,18 @@ + + lua_pop(L, nup); + } /* luaL_setfuncs() */ ++#endif + +- ++#ifndef LUA_OK + #define luaL_newlibtable(L, l) \ + lua_createtable(L, 0, (sizeof (l) / sizeof *(l)) - 1) ++#endif + ++#ifndef LUA_OK + #define luaL_newlib(L, l) \ + (luaL_newlibtable((L), (l)), luaL_setfuncs((L), (l), 0)) ++#endif ++#define LUA_OK 0 + + + static void luaL_requiref(lua_State *L, const char *modname, lua_CFunction openf, int glb) { + diff --git a/dev-lua/luaossl/files/patches/99999999/makefile.oscp.patch b/dev-lua/luaossl/files/patches/99999999/makefile.oscp.patch new file mode 100644 index 0000000..9b0e008 --- /dev/null +++ b/dev-lua/luaossl/files/patches/99999999/makefile.oscp.patch @@ -0,0 +1,13 @@ +diff -NaurBwd a/src/GNUmakefile b/src/GNUmakefile +--- a/src/GNUmakefile 2017-05-10 15:08:48.672212014 +0700 ++++ b/src/GNUmakefile 2017-05-10 15:10:23.462693220 +0700 +@@ -150,7 +150,7 @@ + $$(MKDIR) -p $$(@D) + $$(CP) -p $$< $$@ + +-$$(DESTDIR)$(3)/openssl/ssl/%.lua: $$(d)/openssl.ssl.%.lua ++$$(DESTDIR)$(3)/openssl/ocsp/%.lua: $$(d)/openssl.ocsp.%.lua + $$(LUAC$(1)_$(d)) -p $$< + $$(MKDIR) -p $$(@D) + $$(CP) -p $$< $$@ + diff --git a/dev-lua/luaossl/luaossl-99999999.ebuild b/dev-lua/luaossl/luaossl-99999999.ebuild index 70d04fd..1a65994 100644 --- a/dev-lua/luaossl/luaossl-99999999.ebuild +++ b/dev-lua/luaossl/luaossl-99999999.ebuild @@ -25,6 +25,8 @@ RDEPEND="${DEPEND}" DOCS=(doc/.) EXAMPLES=(examples/.) +PATCHES=("${FILESDIR}/patches/${PV}") + all_lua_prepare() { sed -r \ -e "s@(^prefix ).*@\1=/usr@" \ |