From 2cb2b7405f8e192fc93b1ca079331e07bdd47fd8 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Fri, 16 Aug 2019 21:35:49 +0300 Subject: [PATCH] libgpg-error: replace pthreads-no-weak.patch with sed expression Patch seems has no effect due to autoreconf. --- packages/libgpg-error/build.sh | 5 ++++- packages/libgpg-error/pthreads-no-weak.patch | 12 ------------ 2 files changed, 4 insertions(+), 13 deletions(-) delete mode 100644 packages/libgpg-error/pthreads-no-weak.patch diff --git a/packages/libgpg-error/build.sh b/packages/libgpg-error/build.sh index c63c43f9b..656f4f47c 100644 --- a/packages/libgpg-error/build.sh +++ b/packages/libgpg-error/build.sh @@ -3,10 +3,10 @@ TERMUX_PKG_DESCRIPTION="Small library that defines common error values for all G TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_VERSION=1.36 TERMUX_PKG_REVISION=1 +TERMUX_PKG_SRCURL=https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=babd98437208c163175c29453f8681094bcaf92968a15cafb1a276076b33c97c TERMUX_PKG_BREAKS="libgpg-error-dev" TERMUX_PKG_REPLACES="libgpg-error-dev" -TERMUX_PKG_SRCURL=https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_RM_AFTER_INSTALL="share/common-lisp" termux_step_post_extract_package() { @@ -30,4 +30,7 @@ termux_step_post_extract_package() { termux_step_pre_configure() { autoreconf -fi + # USE_POSIX_THREADS_WEAK is being enabled for on-device build and causes + # errors, so force-disable it. + sed -i 's/USE_POSIX_THREADS_WEAK/DONT_USE_POSIX_THREADS_WEAK/g' configure } diff --git a/packages/libgpg-error/pthreads-no-weak.patch b/packages/libgpg-error/pthreads-no-weak.patch deleted file mode 100644 index f87cd4175..000000000 --- a/packages/libgpg-error/pthreads-no-weak.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr libgpg-error-1.36/m4/threadlib.m4 libgpg-error-1.36.mod/m4/threadlib.m4 ---- libgpg-error-1.36/m4/threadlib.m4 2016-11-12 21:02:56.000000000 +0200 -+++ libgpg-error-1.36.mod/m4/threadlib.m4 2019-08-16 21:23:04.646225294 +0300 -@@ -213,8 +213,6 @@ - [Define if the POSIX multithreading library can be used.]) - if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then - if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then -- AC_DEFINE([USE_POSIX_THREADS_WEAK], [1], -- [Define if references to the POSIX multithreading library should be made weak.]) - LIBTHREAD= - LTLIBTHREAD= - fi