Browse Source

libgpg-error: replace pthreads-no-weak.patch with sed expression

Patch seems has no effect due to autoreconf.
emacs-27
Leonid Plyushch 5 years ago
parent
commit
d6178de21d
No known key found for this signature in database GPG Key ID: 45F2964132545795
  1. 5
      packages/libgpg-error/build.sh
  2. 12
      packages/libgpg-error/pthreads-no-weak.patch

5
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_LICENSE="LGPL-2.0"
TERMUX_PKG_VERSION=1.36 TERMUX_PKG_VERSION=1.36
TERMUX_PKG_REVISION=1 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_SHA256=babd98437208c163175c29453f8681094bcaf92968a15cafb1a276076b33c97c
TERMUX_PKG_BREAKS="libgpg-error-dev" TERMUX_PKG_BREAKS="libgpg-error-dev"
TERMUX_PKG_REPLACES="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_PKG_RM_AFTER_INSTALL="share/common-lisp"
termux_step_post_extract_package() { termux_step_post_extract_package() {
@ -30,4 +30,7 @@ termux_step_post_extract_package() {
termux_step_pre_configure() { termux_step_pre_configure() {
autoreconf -fi 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
} }

12
packages/libgpg-error/pthreads-no-weak.patch

@ -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
Loading…
Cancel
Save