diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-04-06 07:33:47 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-04-06 09:32:47 +0000 |
| commit | ea40eaf6a11afe897fbaca158a1800b410786d4c (patch) | |
| tree | 5a72e1ce5af2c35ef9c4af9a92414a676bcac2d4 /main | |
| parent | cd165a7ef8ff03c240971270d79e823fea711c2c (diff) | |
| download | aports-ea40eaf6a11afe897fbaca158a1800b410786d4c.tar.bz2 aports-ea40eaf6a11afe897fbaca158a1800b410786d4c.tar.xz | |
main/lua-ossl: add lua5.3 and use install_if
Diffstat (limited to 'main')
| -rw-r--r-- | main/lua-ossl/APKBUILD | 16 | ||||
| -rw-r--r-- | main/lua-ossl/fix-lua5.3.patch | 22 |
2 files changed, 32 insertions, 6 deletions
diff --git a/main/lua-ossl/APKBUILD b/main/lua-ossl/APKBUILD index d8b5ad177..7e2947622 100644 --- a/main/lua-ossl/APKBUILD +++ b/main/lua-ossl/APKBUILD @@ -1,11 +1,11 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: -_luaversions="5.1 5.2" +_luaversions="5.1 5.2 5.3" pkgname=lua-ossl pkgver=20141028 _ver=${pkgver%_git*} -pkgrel=0 +pkgrel=1 pkgdesc="comprehensive OpenSSL Lua module" url="http://25thandclement.com/~william/projects/luaossl.html" arch="all" @@ -17,13 +17,13 @@ install="" subpackages="" for _v in $_luaversions; do - depends="$depends lua$_v-ossl" makedepends="$makedepends lua$_v-dev" subpackages="$subpackages lua$_v-ossl:split_${_v/./_}" done source="luaossl-$_ver.tar.gz::https://github.com/wahern/luaossl/archive/deb-$_ver-0.tar.gz musl-fixes.patch + fix-lua5.3.patch " _builddir="$srcdir"/luaossl-deb-$_ver-0 @@ -56,6 +56,7 @@ package() { _split() { local d= _ver=$1 pkgdesc="$pkgdesc for Lua $_ver" + install_if="lua$_ver $pkgname=$pkgver-r$pkgrel" depends= for d in usr/lib/lua usr/share/lua; do if [ -d "$pkgdir"/$d/$_ver ]; then @@ -71,8 +72,11 @@ for _v in $_luaversions; do done md5sums="0f90d964b9a058b1ee7d56be545d54ab luaossl-20141028.tar.gz -7d03f360ebc62b60279ff0f2066ed6f6 musl-fixes.patch" +7d03f360ebc62b60279ff0f2066ed6f6 musl-fixes.patch +b8633e15b72e4e3b7ded22b1d7ca25a0 fix-lua5.3.patch" sha256sums="f4b64936a8ba1792fed14331cf7856646700833e5276a096ef5c6410cd9393c2 luaossl-20141028.tar.gz -49694f9ab7f7a90074471d8e55580f13ff8fc6f7a158a5793f8d55df11147c0e musl-fixes.patch" +49694f9ab7f7a90074471d8e55580f13ff8fc6f7a158a5793f8d55df11147c0e musl-fixes.patch +f525bd6983418d68b2f9edf1b4653d0003c99f58240e601dfa5fd9bd086f43ed fix-lua5.3.patch" sha512sums="8edcb77becb4994c8d2ef0144a45eafcfccf7dca0d78940cf35a4bdbb2daec4be5c4a3a758e2a8ead2e6c395795a44f5b5061f05d1e2149600d48fec09bdf3fc luaossl-20141028.tar.gz -370467081c87c0e4b0c96a72ff81918d3d492dfa90578b34f51004461d9a983ffd486accb44471a34d092b1a08743ad60462c6937096f80f72a39a335ccd81be musl-fixes.patch" +370467081c87c0e4b0c96a72ff81918d3d492dfa90578b34f51004461d9a983ffd486accb44471a34d092b1a08743ad60462c6937096f80f72a39a335ccd81be musl-fixes.patch +29424d2d1cd50f5a0d9dc087583a976cccec738aaaef1d96cc9555ea59193c3affad3fb331c3acb35577a7df453ca85f36b9537d15b778aade67a6f80d8b73af fix-lua5.3.patch" diff --git a/main/lua-ossl/fix-lua5.3.patch b/main/lua-ossl/fix-lua5.3.patch new file mode 100644 index 000000000..79e3376e4 --- /dev/null +++ b/main/lua-ossl/fix-lua5.3.patch @@ -0,0 +1,22 @@ +From ec65507f2ac00a1ad017363a3567ab3e39a6f5cb Mon Sep 17 00:00:00 2001 +From: william <william@25thandclement.com> +Date: Wed, 25 Feb 2015 12:45:41 -0800 +Subject: [PATCH] add des to build and fix Lua 5.3 build + +--- + src/GNUmakefile | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/GNUmakefile b/src/GNUmakefile +index 1b77d43..74a19fe 100644 +--- a/src/GNUmakefile ++++ b/src/GNUmakefile +@@ -20,7 +20,7 @@ OS_$(d) = $(shell $(d)/../mk/vendor.os) + CC_$(d) = $(shell env CC="$(CC) "$(d)/../mk/vendor.cc) + LUAPATH_$(d) = $(shell env CC="$(CC)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" $(<D)/../mk/lua.path -krxm3 -I$(DESTDIR)$(includedir) -I/usr/include -I/usr/local/include -P$(DESTDIR)$(bindir) -P$(bindir) -L$(DESTDIR)$(libdir) -L$(libdir) -v$(1) $(2)) + +-CPPFLAGS_$(d) = $(CPPFLAGS_$(abspath $(@D)/../..)) -DLUA_COMPAT_APIUNSIGNED ++CPPFLAGS_$(d) = $(CPPFLAGS_$(abspath $(@D)/../..)) -DLUA_COMPAT_APIINTCASTS + CFLAGS_$(d) = $(CFLAGS_$(abspath $(@D)/../..)) + LDFLAGS_$(d) = $(LDFLAGS_$(abspath $(@D)/../..)) + SOFLAGS_$(d) = $(SOFLAGS_$(abspath $(@D)/../..)) |