sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

busybox: properly pass compiler & linker flags

Browse Source
This commit is contained in:
Leonid Pliushch 2019-11-11 15:13:05 +02:00
parent 3d3b629763
commit 54a1ae38ed
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/busybox/build.sh
View File

@ -16,15 +16,18 @@ termux_step_pre_configure() {
if $TERMUX_ON_DEVICE_BUILD; then if $TERMUX_ON_DEVICE_BUILD; then
termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds." termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds."
fi fi
CFLAGS+=" -llog" # Android system liblog.so for syslog
} }
termux_step_configure() { termux_step_configure() {
sed -e "s|@TERMUX_PREFIX@|$TERMUX_PREFIX|g" \ sed -e "s|@TERMUX_PREFIX@|$TERMUX_PREFIX|g" \
-e "s|@TERMUX_SYSROOT@|$TERMUX_STANDALONE_TOOLCHAIN/sysroot|g" \ -e "s|@TERMUX_SYSROOT@|$TERMUX_STANDALONE_TOOLCHAIN/sysroot|g" \
-e "s|@TERMUX_HOST_PLATFORM@|${TERMUX_HOST_PLATFORM}|g" \ -e "s|@TERMUX_HOST_PLATFORM@|${TERMUX_HOST_PLATFORM}|g" \
-e "s|@TERMUX_CFLAGS@|$CFLAGS|g" \
-e "s|@TERMUX_LDFLAGS@|$LDFLAGS|g" \
-e "s|@TERMUX_LDLIBS@|-llog|g" \
$TERMUX_PKG_BUILDER_DIR/busybox.config > .config $TERMUX_PKG_BUILDER_DIR/busybox.config > .config
unset CFLAGS LDFLAGS
make oldconfig make oldconfig
} }

6
packages/busybox/busybox.config
View File

@ -49,9 +49,9 @@ CONFIG_PIE=y
# CONFIG_FEATURE_SHARED_BUSYBOX is not set # CONFIG_FEATURE_SHARED_BUSYBOX is not set
CONFIG_CROSS_COMPILER_PREFIX="@TERMUX_HOST_PLATFORM@-" CONFIG_CROSS_COMPILER_PREFIX="@TERMUX_HOST_PLATFORM@-"
CONFIG_SYSROOT="@TERMUX_SYSROOT@" CONFIG_SYSROOT="@TERMUX_SYSROOT@"
CONFIG_EXTRA_CFLAGS="" CONFIG_EXTRA_CFLAGS="@TERMUX_CFLAGS@"
CONFIG_EXTRA_LDFLAGS="" CONFIG_EXTRA_LDFLAGS="@TERMUX_LDFLAGS@"
CONFIG_EXTRA_LDLIBS="" CONFIG_EXTRA_LDLIBS="@TERMUX_LDLIBS@"
# CONFIG_USE_PORTABLE_CODE is not set # CONFIG_USE_PORTABLE_CODE is not set
# CONFIG_STACK_OPTIMIZATION_386 is not set # CONFIG_STACK_OPTIMIZATION_386 is not set