Skip to content

Commit 36268af

Browse files
committed
rebuild(cmus): Remove time.h reset that's no longer needed with new Bionic guard patch, as pointed out by @robertkirkman
1 parent 0b0f290 commit 36268af

1 file changed

Lines changed: 1 addition & 9 deletions

File tree

packages/cmus/build.sh

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Small, fast and powerful console music player"
33
TERMUX_PKG_LICENSE="GPL-2.0"
44
TERMUX_PKG_MAINTAINER="@termux"
55
TERMUX_PKG_VERSION="2.12.0"
6-
TERMUX_PKG_REVISION="5"
6+
TERMUX_PKG_REVISION="6"
77
TERMUX_PKG_DEPENDS="ffmpeg, libandroid-support, libflac, libiconv, libmad, libmodplug, libvorbis, libwavpack, ncurses, opusfile, pulseaudio, alsa-lib"
88
TERMUX_PKG_SRCURL=https://github.com/cmus/cmus/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
99
TERMUX_PKG_SHA256=44b96cd5f84b0d84c33097c48454232d5e6a19cd33b9b6503ba9c13b6686bfc7
@@ -27,14 +27,6 @@ termux_step_pre_configure() {
2727
mkdir -p "${_libdir}"
2828
cp "$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/$TERMUX_HOST_PLATFORM/26/libaaudio.so" "${_libdir}"
2929
LDFLAGS+=" -L${_libdir}"
30-
# this commit https://github.com/termux/termux-packages/commit/0970a2f2d89f64acd7a3fc94845d298bee010cc6 ,
31-
# which was necessary to compile coreutils with NDK 27,
32-
# is, on the other hand, when combined with NDK r28c,
33-
# incompatible with '-D__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__ -Werror=unguarded-availability,'
34-
# which is used internally by the cmus package,
35-
# so the vanilla header must be used for cmus in order to pass its termux_step_post_massage() successfully.
36-
cp "$HOME/lib/android-ndk-r$TERMUX_NDK_VERSION/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/time.h" "${_libdir}"
37-
CFLAGS+=" -I${_libdir}/"
3830
fi
3931

4032
LD=$CC

0 commit comments

Comments
 (0)