From 46c8cd16794bed652fc74dde7f0dc342682a5837 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Fri, 11 Nov 2022 21:12:23 +0200 Subject: [PATCH] busybox: build shared library Explained there: https://github.com/termux/termux-packages/issues/13000 --- packages/busybox/build.sh | 12 ++++++------ packages/busybox/busybox.config | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/busybox/build.sh b/packages/busybox/build.sh index fa6a5f2119..31c021269a 100644 --- a/packages/busybox/build.sh +++ b/packages/busybox/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Tiny versions of many common UNIX utilities into a singl TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.35.0 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://busybox.net/downloads/busybox-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=faeeb244c35a348a334f4a59e44626ee870fb07b6884d68c10ae8bc19f83a694 TERMUX_PKG_BUILD_IN_SRC=true @@ -33,15 +33,15 @@ termux_step_configure() { -e "s|@TERMUX_LDFLAGS@|$LDFLAGS|g" \ -e "s|@TERMUX_LDLIBS@|log|g" \ $TERMUX_PKG_BUILDER_DIR/busybox.config > .config - unset CFLAGS LDFLAGS make oldconfig } -termux_step_post_make_install() { - if $TERMUX_DEBUG_BUILD; then - install -Dm700 busybox_unstripped $TERMUX_PREFIX/bin/busybox - fi +termux_step_make_install() { + # Using unstripped variant. The post-massage step will strip binaries anyway. + install -Dm700 ./0_lib/busybox_unstripped $TERMUX_PREFIX/bin/busybox + install -Dm700 ./0_lib/libbusybox.so.${TERMUX_PKG_VERSION}_unstripped $TERMUX_PREFIX/lib/libbusybox.so.${TERMUX_PKG_VERSION} + ln -sfr $TERMUX_PREFIX/lib/libbusybox.so.${TERMUX_PKG_VERSION} $TERMUX_PREFIX/lib/libbusybox.so # Install busybox man page. install -Dm600 -t $TERMUX_PREFIX/share/man/man1 $TERMUX_PKG_SRCDIR/docs/busybox.1 diff --git a/packages/busybox/busybox.config b/packages/busybox/busybox.config index 3a56de8ff6..5311e3b06f 100644 --- a/packages/busybox/busybox.config +++ b/packages/busybox/busybox.config @@ -41,12 +41,12 @@ CONFIG_FEATURE_SYSLOG=y # Build Options # # CONFIG_STATIC is not set -CONFIG_PIE=y +# CONFIG_PIE is not set # CONFIG_NOMMU is not set -# CONFIG_BUILD_LIBBUSYBOX is not set +CONFIG_BUILD_LIBBUSYBOX=y # CONFIG_FEATURE_LIBBUSYBOX_STATIC is not set # CONFIG_FEATURE_INDIVIDUAL is not set -# CONFIG_FEATURE_SHARED_BUSYBOX is not set +CONFIG_FEATURE_SHARED_BUSYBOX=y CONFIG_CROSS_COMPILER_PREFIX="@TERMUX_HOST_PLATFORM@-" CONFIG_SYSROOT="@TERMUX_SYSROOT@" CONFIG_EXTRA_CFLAGS="@TERMUX_CFLAGS@"