diff --git a/lua/PKGBUILD b/lua/PKGBUILD index 79759b6..5639fcf 100644 --- a/lua/PKGBUILD +++ b/lua/PKGBUILD @@ -8,9 +8,8 @@ pkgname=lua pkgver=5.4.4 _majorver=${pkgver%.*} -pkgrel=03 +pkgrel=04 pkgdesc='Powerful lightweight programming language designed for extending applications' -arch=('x86_64') url='https://www.lua.org/' depends=('readline') #options=('!emptydirs' 'debug') @@ -21,16 +20,22 @@ source=(https://www.lua.org/ftp/lua-$pkgver.tar.gz LICENSE) prepare() { - cd lua-$pkgver - patch -p1 -i ../liblua.so.patch + patch -d lua-$pkgver -p1 -i ../liblua.so.patch + cp -r lua-$pkgver lua++-$pkgver + + sed "s/%VER%/$_majorver/g;s/%REL%/$pkgver/g" lua.pc > lua-$pkgver/lua.pc + sed "s/%VER%/$_majorver/g;s/%REL%/$pkgver/g;s/-llua/-llua++/g" lua.pc > lua++-$pkgver/lua++.pc - sed "s/%VER%/$_majorver/g;s/%REL%/$pkgver/g" ../lua.pc > lua.pc } build() { cd lua-$pkgver make MYCFLAGS="$CFLAGS -fPIC" MYLDFLAGS="$LDFLAGS" linux-readline + + cd ../lua++-$pkgver + + make MYCFLAGS="$CXXFLAGS -fPIC" MYLDFLAGS="$LDFLAGS" CC=g++ LUA_A=liblua++.a LUA_SO=liblua++.so linux-readline } package() { @@ -54,9 +59,26 @@ package() { install -d "$pkgdir"/usr/share/doc/$pkgname install -m644 doc/*.{gif,png,css,html} "$pkgdir"/usr/share/doc/$pkgname install -Dm644 ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE + + cd ../lua++-$pkgver + make \ + TO_LIB="liblua++.a liblua++.so liblua++.so.$_majorver liblua++.so.$pkgver" \ + INSTALL_BIN=null INSTALL_INC=null INSTALL_MAN=../null \ + INSTALL_DATA='cp -d' \ + INSTALL_TOP="$pkgdir"/usr \ + install + ln -sf /usr/lib/liblua++.so.$pkgver "$pkgdir"/usr/lib/liblua++$_majorver.so + + install -Dm644 lua++.pc "$pkgdir"/usr/lib/pkgconfig/lua++54.pc + ln -sf lua++54.pc "$pkgdir"/usr/lib/pkgconfig/lua++.pc + ln -sf lua++54.pc "$pkgdir"/usr/lib/pkgconfig/lua++5.4.pc + ln -sf lua++54.pc "$pkgdir"/usr/lib/pkgconfig/lua++-5.4.pc + } -#---- license gpg-key sha256sums ---- +#---- arch license gpg-key & sha256sums ---- + +arch=(x86_64) license=('MIT') @@ -70,6 +92,6 @@ sha256sums=(164c7849653b80ae67bec4b7473b884bf5cc8d2dca05653475ec2ed27b9ebf61 # l ca9252633e782b8f85d6a94ea4f6babd4fe30bd759085b373160b1878e36ff78 # lua.pc 142fb08b41a807b192b4b2c166696a1830a1c97967e5099ad0e579bf500e1da4) # LICENSE - # 24215f2fe961b53509d65d25942e560c7bc8c83bbb8a5dc14235a291902fe867 lua-5.4.4-03-x86_64.pkg.tar.xz +## 33f8ae8e0331831177d2355debe53fc9a191ac576c86aa7e4f98ece924c64b6e lua-5.4.4-04-x86_64.pkg.tar.lz diff --git a/lua/PKGBUILD-arch b/lua/PKGBUILD-arch index b88d353..9dbde3e 100644 --- a/lua/PKGBUILD-arch +++ b/lua/PKGBUILD-arch @@ -5,13 +5,13 @@ pkgname=lua pkgver=5.4.4 _majorver=${pkgver%.*} -pkgrel=3 +pkgrel=4 pkgdesc='Powerful lightweight programming language designed for extending applications' arch=('x86_64') url='https://www.lua.org/' depends=('readline') license=('MIT') -options=('!emptydirs' 'debug') +options=('!emptydirs') source=(https://www.lua.org/ftp/lua-$pkgver.tar.gz liblua.so.patch lua.pc @@ -22,16 +22,21 @@ sha256sums=('164c7849653b80ae67bec4b7473b884bf5cc8d2dca05653475ec2ed27b9ebf61' '142fb08b41a807b192b4b2c166696a1830a1c97967e5099ad0e579bf500e1da4') prepare() { - cd lua-$pkgver - patch -p1 -i ../liblua.so.patch + patch -d lua-$pkgver -p1 -i ../liblua.so.patch + cp -r lua-$pkgver lua++-$pkgver - sed "s/%VER%/$_majorver/g;s/%REL%/$pkgver/g" ../lua.pc > lua.pc + sed "s/%VER%/$_majorver/g;s/%REL%/$pkgver/g" lua.pc > lua-$pkgver/lua.pc + sed "s/%VER%/$_majorver/g;s/%REL%/$pkgver/g;s/-llua/-llua++/g" lua.pc > lua++-$pkgver/lua++.pc } build() { cd lua-$pkgver make MYCFLAGS="$CFLAGS -fPIC" MYLDFLAGS="$LDFLAGS" linux-readline + + cd ../lua++-$pkgver + + make MYCFLAGS="$CXXFLAGS -fPIC" MYLDFLAGS="$LDFLAGS" CC=g++ LUA_A=liblua++.a LUA_SO=liblua++.so linux-readline } package() { @@ -55,4 +60,18 @@ package() { install -d "$pkgdir"/usr/share/doc/$pkgname install -m644 doc/*.{gif,png,css,html} "$pkgdir"/usr/share/doc/$pkgname install -Dm644 ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE + + cd ../lua++-$pkgver + make \ + TO_LIB="liblua++.a liblua++.so liblua++.so.$_majorver liblua++.so.$pkgver" \ + INSTALL_BIN=null INSTALL_INC=null INSTALL_MAN=../null \ + INSTALL_DATA='cp -d' \ + INSTALL_TOP="$pkgdir"/usr \ + install + ln -sf /usr/lib/liblua++.so.$pkgver "$pkgdir"/usr/lib/liblua++$_majorver.so + + install -Dm644 lua++.pc "$pkgdir"/usr/lib/pkgconfig/lua++54.pc + ln -sf lua++54.pc "$pkgdir"/usr/lib/pkgconfig/lua++.pc + ln -sf lua++54.pc "$pkgdir"/usr/lib/pkgconfig/lua++5.4.pc + ln -sf lua++54.pc "$pkgdir"/usr/lib/pkgconfig/lua++-5.4.pc } diff --git a/lua/deps b/lua/deps index 139597f..d017174 100644 --- a/lua/deps +++ b/lua/deps @@ -1,2 +1,3 @@ +depends=('readline') diff --git a/lua/time b/lua/time index 696b4ed..80f5b75 100644 --- a/lua/time +++ b/lua/time @@ -1,5 +1,6 @@ -real 0m10.784s -user 0m10.379s -sys 0m0.843s +real 0m41.291s +user 0m33.498s +sys 0m2.204s +