summaryrefslogtreecommitdiffstats
path: root/lua-forge
diff options
context:
space:
mode:
authorThomas Orgis2017-02-04 11:18:40 +0100
committerThomas Orgis2017-02-04 11:18:40 +0100
commit4f3a47376c8e2fc2315eaee6efd0d3cf0e0abe61 (patch)
tree4f6d40e8cee5481b4340ba7f0d2c4f014205fc67 /lua-forge
parent8d472737bf2cd02b370c6599c765b2b4185a3f72 (diff)
lua: fix lua.pc version number
Diffstat (limited to 'lua-forge')
-rwxr-xr-xlua-forge/lua/DETAILS1
-rw-r--r--lua-forge/lua/HISTORY4
-rwxr-xr-xlua-forge/lua/PRE_BUILD3
3 files changed, 7 insertions, 1 deletions
diff --git a/lua-forge/lua/DETAILS b/lua-forge/lua/DETAILS
index f52c385bad..6c977d9a4b 100755
--- a/lua-forge/lua/DETAILS
+++ b/lua-forge/lua/DETAILS
@@ -1,5 +1,6 @@
SPELL=lua
VERSION=5.3.3
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://www.lua.org/ftp/$SOURCE
diff --git a/lua-forge/lua/HISTORY b/lua-forge/lua/HISTORY
index f60489a91f..f94613cd1f 100644
--- a/lua-forge/lua/HISTORY
+++ b/lua-forge/lua/HISTORY
@@ -1,3 +1,7 @@
+2017-02-04 Thomas Orgis <sobukus@sourcemage.org>
+ * PRE_BUILD: fix lua.pc, need to turn $V into ${V} in deref
+ * DETAILS: ++PATCHLEVEL
+
2016-09-26 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* PRE_BUILD, INSTALL, lua.pc lua.pc.in: automatically adapt lua.pc
diff --git a/lua-forge/lua/PRE_BUILD b/lua-forge/lua/PRE_BUILD
index 9a1f2e5579..e84eb0b3f9 100755
--- a/lua-forge/lua/PRE_BUILD
+++ b/lua-forge/lua/PRE_BUILD
@@ -9,7 +9,8 @@ patch -p0 < "$SPELL_DIRECTORY/shared.patch" &&
echo '# lua.pc -- pkg-config data for Lua' > "${SOURCE_DIRECTORY}/lua.pc" &&
grep '^V=' "${SOURCE_DIRECTORY}/Makefile" >> "${SOURCE_DIRECTORY}/lua.pc" &&
-grep '^R=' "${SOURCE_DIRECTORY}/Makefile" >> "${SOURCE_DIRECTORY}/lua.pc" &&
+grep '^R=' "${SOURCE_DIRECTORY}/Makefile" \
+ | sed -e 's,$V,${V},' >> "${SOURCE_DIRECTORY}/lua.pc" &&
grep '^INSTALL_.*=' "${SOURCE_DIRECTORY}/Makefile" \
| grep -v 'INSTALL_DATA' \
| grep -v 'INSTALL_EXEC' \