From fddbdc20f81c32750407322e4aa6f8a1d4002cda Mon Sep 17 00:00:00 2001 From: Leap of Azzam <76893443+leapofazzam123@users.noreply.github.com> Date: Thu, 30 Dec 2021 17:17:37 +0700 Subject: [PATCH] liblua 52 53 54: add static library subpackage (#7939) %ci:no-build --- packages/liblua52/build.sh | 2 +- packages/liblua53/build.sh | 2 +- packages/liblua54/build.sh | 2 +- packages/libluajit/build.sh | 4 +++- packages/libluajit/src-Makefile.patch | 17 ----------------- 5 files changed, 6 insertions(+), 21 deletions(-) diff --git a/packages/liblua52/build.sh b/packages/liblua52/build.sh index 2e2f3a79a..fb581b384 100644 --- a/packages/liblua52/build.sh +++ b/packages/liblua52/build.sh @@ -29,7 +29,7 @@ termux_step_make() { termux_step_make_install() { make \ TO_BIN="lua5.2 luac5.2" \ - TO_LIB="liblua5.2.so liblua5.2.so.5.2 liblua5.2.so.${TERMUX_PKG_VERSION}" \ + TO_LIB="liblua5.2.so liblua5.2.so.5.2 liblua5.2.so.${TERMUX_PKG_VERSION} liblua5.2.a" \ INSTALL_DATA="cp -d" \ INSTALL_TOP="$TERMUX_PREFIX" \ INSTALL_INC="$TERMUX_PREFIX/include/lua5.2" \ diff --git a/packages/liblua53/build.sh b/packages/liblua53/build.sh index fa7831273..8f02047ea 100644 --- a/packages/liblua53/build.sh +++ b/packages/liblua53/build.sh @@ -28,7 +28,7 @@ termux_step_pre_configure() { termux_step_make_install() { make \ TO_BIN="lua5.3 luac5.3" \ - TO_LIB="liblua5.3.so liblua5.3.so.5.3 liblua5.3.so.${TERMUX_PKG_VERSION}" \ + TO_LIB="liblua5.3.so liblua5.3.so.5.3 liblua5.3.so.${TERMUX_PKG_VERSION} liblua5.3.a" \ INSTALL_DATA="cp -d" \ INSTALL_TOP="$TERMUX_PREFIX" \ INSTALL_INC="$TERMUX_PREFIX/include/lua5.3" \ diff --git a/packages/liblua54/build.sh b/packages/liblua54/build.sh index ee1e1fe51..304af8d7d 100644 --- a/packages/liblua54/build.sh +++ b/packages/liblua54/build.sh @@ -28,7 +28,7 @@ termux_step_pre_configure() { termux_step_make_install() { make \ TO_BIN="lua5.4 luac5.4" \ - TO_LIB="liblua5.4.so liblua5.4.so.5.4 liblua5.4.so.${TERMUX_PKG_VERSION}" \ + TO_LIB="liblua5.4.so liblua5.4.so.5.4 liblua5.4.so.${TERMUX_PKG_VERSION} liblua5.4.a" \ INSTALL_DATA="cp -d" \ INSTALL_TOP="$TERMUX_PREFIX" \ INSTALL_INC="$TERMUX_PREFIX/include/lua5.4" \ diff --git a/packages/libluajit/build.sh b/packages/libluajit/build.sh index fc0cb0db0..a8c1a7610 100644 --- a/packages/libluajit/build.sh +++ b/packages/libluajit/build.sh @@ -37,10 +37,12 @@ termux_step_make_install () { rm -f $TERMUX_PREFIX/lib/libluajit* install -Dm600 $TERMUX_PKG_SRCDIR/src/libluajit.so $TERMUX_PREFIX/lib/libluajit-5.1.so.2.1.0 + install -Dm600 $TERMUX_PKG_SRCDIR/src/libluajit.a $TERMUX_PREFIX/lib/libluajit-5.1.a (cd $TERMUX_PREFIX/lib; ln -s -f libluajit-5.1.so.2.1.0 libluajit.so; ln -s -f libluajit-5.1.so.2.1.0 libluajit-5.1.so; - ln -s -f libluajit-5.1.so.2.1.0 libluajit-5.1.so.2;) + ln -s -f libluajit-5.1.so.2.1.0 libluajit-5.1.so.2; + ln -s -f libluajit-5.1.a libluajit.a;) install -Dm600 $TERMUX_PKG_SRCDIR/etc/luajit.1 $TERMUX_PREFIX/share/man/man1/luajit.1 install -Dm600 $TERMUX_PKG_SRCDIR/etc/luajit.pc $TERMUX_PREFIX/lib/pkgconfig/luajit.pc diff --git a/packages/libluajit/src-Makefile.patch b/packages/libluajit/src-Makefile.patch index e2c6c6e6c..08efc36a1 100644 --- a/packages/libluajit/src-Makefile.patch +++ b/packages/libluajit/src-Makefile.patch @@ -9,23 +9,6 @@ # # Use this if you want to force a 32 bit build on a 64 bit multilib OS. #CC= $(DEFAULT_CC) -m32 -@@ -71,14 +71,14 @@ - # as dynamic mode. - # - # Mixed mode creates a static + dynamic library and a statically linked luajit. --BUILDMODE= mixed -+#BUILDMODE= mixed - # - # Static mode creates a static library and a statically linked luajit. - #BUILDMODE= static - # - # Dynamic mode creates a dynamic library and a dynamically linked luajit. - # Note: this executable will only run when the library is installed! --#BUILDMODE= dynamic -+BUILDMODE= dynamic - # - ############################################################################## - @@ -192,7 +192,7 @@ CCOPTIONS= $(CCDEBUG) $(ASOPTIONS) LDOPTIONS= $(CCDEBUG) $(LDFLAGS)