mirror of
https://github.com/termux-pacman/termux-packages.git
synced 2026-01-06 02:43:23 +00:00
ea37ad99a0
NDK r25 has removed GNU Assembler (GAS). Removal of GAS introduced a number of build issues. The most prominent is: /usr/bin/as: unrecognized option '-EL' Some options to solve this: 1. Disable building custom assembly and suffer performance penalty 2. Hand rewrite the custom assembly to be LLVM compatible 3. Wait for upstream to write LLVM compatible assembly (openssl, openssl-1.1) 4. Bring back GAS from NDK r23c In this commit, GAS is brought back as a separate toolchain instead of following NDK r23c file hierarchy. We pass "--gcc-toolchain=GAS_TOOLCHAIN_DIR" to NDK r25 clang to detect. Packages only have to add "termux_step_gnu_as_23c" to build.sh to enable GAS. In the future, we expect packages should follow option 3 more than option 4 as that is a last resort. This commit also bumps revision for packages that rely (or previously rely) on "-fno-integrated-as": hors, libffi, libgcrypt, libpixman, openssl, openssl-1.1 Co-authored-by: Henrik Grimler <grimler@termux.dev> Co-authored-by: Chongyun Lee <45286352+licy183@users.noreply.github.com>
32 lines
1.3 KiB
Bash
32 lines
1.3 KiB
Bash
TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/libgcrypt/
|
|
TERMUX_PKG_DESCRIPTION="General purpose cryptographic library based on the code from GnuPG"
|
|
TERMUX_PKG_LICENSE="GPL-2.0, LGPL-2.1, BSD 3-Clause, MIT, Public Domain"
|
|
TERMUX_PKG_LICENSE_FILE="COPYING, COPYING.LIB, LICENSES"
|
|
TERMUX_PKG_MAINTAINER="@termux"
|
|
TERMUX_PKG_VERSION=1.10.1
|
|
TERMUX_PKG_REVISION=1
|
|
TERMUX_PKG_SRCURL=https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-${TERMUX_PKG_VERSION}.tar.bz2
|
|
TERMUX_PKG_SHA256=ef14ae546b0084cd84259f61a55e07a38c3b53afc0f546bffcef2f01baffe9de
|
|
TERMUX_PKG_DEPENDS="libgpg-error"
|
|
TERMUX_PKG_BREAKS="libgcrypt-dev"
|
|
TERMUX_PKG_REPLACES="libgcrypt-dev"
|
|
# configure tries to detect pthreads by linking with -lpthread, which does not exist on Android:
|
|
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
|
|
ac_cv_lib_pthread_pthread_create=yes
|
|
--disable-jent-support
|
|
"
|
|
|
|
termux_step_pre_configure() {
|
|
termux_setup_gnu_as_23c
|
|
CFLAGS+=" -fno-integrated-as"
|
|
if [ "$TERMUX_ARCH" = arm ]; then
|
|
# See http://marc.info/?l=gnupg-devel&m=139136972631909&w=3
|
|
CFLAGS+=" -mno-unaligned-access"
|
|
# Avoid text relocations:
|
|
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" gcry_cv_gcc_inline_asm_neon=no"
|
|
elif [ "$TERMUX_ARCH" = i686 ] || [ "$TERMUX_ARCH" = x86_64 ]; then
|
|
# Fix i686 android build, also in https://bugzilla.gnome.org/show_bug.cgi?id=724050
|
|
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --disable-asm"
|
|
fi
|
|
}
|