From 9b930b9adfe7eed6988d03520aba5060556aa246 Mon Sep 17 00:00:00 2001 From: Christopher Brannon Date: Wed, 12 Jul 2017 17:18:51 -0700 Subject: [PATCH] luaposix: update to 34.0.1. Also build all of luaposix, luaposix51, and luaposix52 from a single template. I used the strategy that several other Lua packages in our tree have used. Closes: #7031 [via git-merge-pr] --- srcpkgs/luaposix/template | 68 +++++++++++++++++++++++++++++++------ srcpkgs/luaposix51 | 1 + srcpkgs/luaposix51/template | 32 ----------------- srcpkgs/luaposix52 | 1 + srcpkgs/luaposix52/template | 23 ------------- 5 files changed, 60 insertions(+), 65 deletions(-) create mode 120000 srcpkgs/luaposix51 delete mode 100644 srcpkgs/luaposix51/template create mode 120000 srcpkgs/luaposix52 delete mode 100644 srcpkgs/luaposix52/template diff --git a/srcpkgs/luaposix/template b/srcpkgs/luaposix/template index 62888ec92ce..32d16ad445e 100644 --- a/srcpkgs/luaposix/template +++ b/srcpkgs/luaposix/template @@ -1,23 +1,71 @@ # Template file for 'luaposix' pkgname=luaposix -version=33.4.0 +version=34.0.1 revision=1 lib32disabled=yes -wrksrc="${pkgname}-release-v${version}" -build_style=gnu-configure -configure_args="--libdir=/usr/lib/lua/5.3 --datadir=/usr/share/lua/5.3 --docdir=/usr/share/doc/${pkgname}" -hostmakedepends="perl lua-devel" -makedepends="ncurses-devel lua-devel" +wrksrc="luaposix-release-v${version}" +hostmakedepends="lua51-devel lua52-devel lua-devel" +makedepends="lua51-devel lua52-devel lua-devel" depends="lua" short_desc="A POSIX library for Lua programming language" maintainer="Juan RP " license="MIT" homepage="http://luaforge.net/projects/luaposix/" distfiles="https://github.com/luaposix/luaposix/archive/release-v${version}.tar.gz" -checksum=e66262f5b7fe1c32c65f17a5ef5ffb31c4d1877019b4870a5d373e2ab6526a21 +checksum=06bc4843f9b7acced6eea1b46c30d82f52df0654100c5c59ea7de7a13c687693 + +post_extract() { + cd "${wrksrc}" + mkdir -p lua5.1 + mv * lua5.1 || true + cp -a lua5.1 lua5.2 + cp -a lua5.1 lua5.3 +} + +do_build() { + for _lua_version in 5.1 5.2 5.3; do + pushd lua${_lua_version} + lua${_lua_version} build-aux/luke version=${version} PREFIX=/usr \ + LUA_INCDIR="${XBPS_CROSS_BASE}/usr/include/lua${_lua_version}" \ + CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS $CFLAGS" + popd + done +} + +do_install() { + for _lua_version in 5.1 5.2 5.3; do + pushd lua${_lua_version} + lua${_lua_version} build-aux/luke PREFIX="${DESTDIR}/usr" install + popd + done +} post_install() { - vlicense COPYING - vmkdir usr/share/$pkgname/examples - vcopy "examples/*.lua" usr/share/$pkgname/examples + vlicense lua5.3/LICENSE + vmkdir usr/share/doc/$pkgname + vcopy "lua5.3/doc/*" usr/share/doc/$pkgname +} + +luaposix51_package() { + depends="lua51 lua51-bitlib" + short_desc="${_desc} - Lua 5.1" + pkg_install() { + vlicense "${wrksrc}/lua5.1/LICENSE" + vmove usr/lib/lua/5.1 + vmove usr/share/lua/5.1 + vmkdir usr/share/doc/$pkgname + vcopy "${wrksrc}/lua5.1/doc/*" usr/share/doc/$pkgname + } +} + +luaposix52_package() { + short_desc="${_desc} - Lua 5.2" + depends="lua52" + pkg_install() { + vlicense "${wrksrc}/lua5.2/LICENSE" + vmove usr/lib/lua/5.2 + vmove usr/share/lua/5.2 + vmkdir usr/share/doc/$pkgname + vcopy "${wrksrc}/lua5.2/doc/*" usr/share/doc/$pkgname + } } diff --git a/srcpkgs/luaposix51 b/srcpkgs/luaposix51 new file mode 120000 index 00000000000..4789a96bd38 --- /dev/null +++ b/srcpkgs/luaposix51 @@ -0,0 +1 @@ +luaposix \ No newline at end of file diff --git a/srcpkgs/luaposix51/template b/srcpkgs/luaposix51/template deleted file mode 100644 index e3bcc5781c4..00000000000 --- a/srcpkgs/luaposix51/template +++ /dev/null @@ -1,32 +0,0 @@ -# Template file for 'luaposix51' -pkgname=luaposix51 -version=33.4.0 -revision=1 -lib32disabled=yes -wrksrc="luaposix-release-v${version}" -build_style=gnu-configure -configure_args="--libdir=/usr/lib/lua/5.3 --datadir=/usr/share/lua/5.3 --docdir=/usr/share/doc/${pkgname}" -hostmakedepends="perl lua51-devel automake libtool" -makedepends="ncurses-devel lua51-devel" -depends="lua51 lua51-bitlib" -short_desc="A POSIX library for Lua programming language" -maintainer="Juan RP " -license="MIT" -homepage="http://luaforge.net/projects/luaposix/" -distfiles="https://github.com/luaposix/luaposix/archive/release-v${version}.tar.gz" -checksum=e66262f5b7fe1c32c65f17a5ef5ffb31c4d1877019b4870a5d373e2ab6526a21 - -make_build_args="INCLUDES=-I${XBPS_CROSS_BASE}/usr/include/lua5.1" - -pre_configure() { - # Fix Cross - sed -i 's/AX_LUA_HEADERS/#AX_LUA_HEADERS/' configure.ac - - autoreconf -i -} - -post_install() { - vlicense COPYING - vmkdir usr/share/$pkgname/examples - vcopy "examples/*.lua" usr/share/$pkgname/examples -} diff --git a/srcpkgs/luaposix52 b/srcpkgs/luaposix52 new file mode 120000 index 00000000000..4789a96bd38 --- /dev/null +++ b/srcpkgs/luaposix52 @@ -0,0 +1 @@ +luaposix \ No newline at end of file diff --git a/srcpkgs/luaposix52/template b/srcpkgs/luaposix52/template deleted file mode 100644 index 828f9419477..00000000000 --- a/srcpkgs/luaposix52/template +++ /dev/null @@ -1,23 +0,0 @@ -# Template file for 'luaposix52' -pkgname=luaposix52 -version=33.4.0 -revision=1 -lib32disabled=yes -wrksrc="luaposix-release-v${version}" -build_style=gnu-configure -configure_args="--libdir=/usr/lib/lua/5.3 --datadir=/usr/share/lua/5.3 --docdir=/usr/share/doc/${pkgname}" -hostmakedepends="perl lua52-devel" -makedepends="ncurses-devel lua52-devel" -depends="lua52" -short_desc="A POSIX library for Lua programming language" -maintainer="Chris Brannon " -license="MIT" -homepage="http://luaforge.net/projects/luaposix/" -distfiles="https://github.com/luaposix/luaposix/archive/release-v${version}.tar.gz" -checksum=e66262f5b7fe1c32c65f17a5ef5ffb31c4d1877019b4870a5d373e2ab6526a21 - -post_install() { - vlicense COPYING - vmkdir usr/share/$pkgname/examples - vcopy "examples/*.lua" usr/share/$pkgname/examples -}