From 84cf44a3e94ffb3afd3cc24e88665792d8aeb77e Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Mon, 4 Nov 2024 01:33:16 -0500 Subject: development/lua51: Fix .pc file on 32-bit. Signed-off-by: B. Watson Signed-off-by: Willy Sudiarto Raharjo --- development/lua51/lua51.SlackBuild | 10 +++++----- development/lua51/lua51.pc | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'development') diff --git a/development/lua51/lua51.SlackBuild b/development/lua51/lua51.SlackBuild index 6fb1927a87530..3646bf4459f0e 100644 --- a/development/lua51/lua51.SlackBuild +++ b/development/lua51/lua51.SlackBuild @@ -12,12 +12,14 @@ # Granted WTFPL, Version 2, as published by Sam Hocevar. See # http://sam.zoy.org/wtfpl/COPYING for more details. +# 20241104 bkw: BUILD=2, fix doubleplusungood refs lib64 in .pc file. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=lua51 SRCNAM=lua VERSION=${VERSION:-5.1.5} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -67,11 +69,9 @@ PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION PKGMAN1=$PKG/usr/man/man1 PKGINC=$PKG/usr/include -# Fix up a to-be-installed header and the pkgconfig file +# Fix up a to-be-installed header. sed -i "s|/usr/local|/usr|" src/luaconf.h sed -i "s|lib/lua|$LIB/lua|" src/luaconf.h -sed -i "s|/usr/local|/usr|" etc/lua.pc -sed -i "s|prefix}/lib|prefix}/$LIB|g" etc/lua.pc runmake() { make $1 \ @@ -113,7 +113,7 @@ cd .. # and install the pkgconfig file mkdir -p $PKGLIB/pkgconfig -cat $CWD/lua51.pc > $PKGLIB/pkgconfig/lua51.pc +sed "s,\,$LIB,g" < $CWD/lua51.pc > $PKGLIB/pkgconfig/lua51.pc ln -s lua51.pc $PKGLIB/pkgconfig/lua$V.pc mkdir -p $PKGDOC/{extras,html} diff --git a/development/lua51/lua51.pc b/development/lua51/lua51.pc index 80fbc5d1f4d44..878fa26a5fded 100644 --- a/development/lua51/lua51.pc +++ b/development/lua51/lua51.pc @@ -11,14 +11,14 @@ R= 5.1.5 prefix= /usr INSTALL_BIN= ${prefix}/bin INSTALL_INC= ${prefix}/include/lua${V} -INSTALL_LIB= ${prefix}/lib64 +INSTALL_LIB= ${prefix}/lib INSTALL_MAN= ${prefix}/man/man1 INSTALL_LMOD= ${prefix}/share/lua/${V} -INSTALL_CMOD= ${prefix}/lib64/lua/${V} +INSTALL_CMOD= ${prefix}/lib/lua/${V} # canonical vars exec_prefix=${prefix} -libdir=${exec_prefix}/lib64 +libdir=${exec_prefix}/lib includedir=${prefix}/include/lua${V} Name: Lua -- cgit v1.2.3