diff options
| -rw-r--r-- | patches/weechat-2.7.local.patch | 16 | ||||
| -rw-r--r-- | vars/build.vars | 2 |
2 files changed, 10 insertions, 8 deletions
diff --git a/patches/weechat-2.7.local.patch b/patches/weechat-2.7.local.patch index 2b08df5b..279185c6 100644 --- a/patches/weechat-2.7.local.patch +++ b/patches/weechat-2.7.local.patch @@ -1,14 +1,16 @@ ---- weechat-2.1/configure.orig 2017-11-28 13:45:00.520000000 +0000 -+++ weechat-2.1/configure 2017-11-28 13:46:29.676000000 +0000 -@@ -22487,7 +22487,6 @@ +--- weechat-2.7/configure.orig 2020-02-09 23:15:37.432482865 +0000 ++++ weechat-2.7/configure 2020-02-09 23:17:57.591493077 +0000 +@@ -22793,8 +22793,7 @@ # pkg-config # ------------------------------------------------------------------------------ -PKGCONFIG="" - for ac_prog in pkg-config +-for ac_prog in pkg-config ++for ac_prog in $PKG_CONFIG do # Extract the first word of "$ac_prog", so it can be a program name with args. -@@ -24277,8 +24276,8 @@ + set dummy $ac_prog; ac_word=$2 +@@ -24756,8 +24755,8 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -19,7 +21,7 @@ fi -@@ -24355,8 +24354,8 @@ +@@ -24834,8 +24833,8 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -30,7 +32,7 @@ $as_echo "#define HAVE_GNUTLS 1" >>confdefs.h -@@ -24567,8 +24566,8 @@ +@@ -25046,8 +25045,8 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } diff --git a/vars/build.vars b/vars/build.vars index bda97ef1..70dfaae8 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -1955,8 +1955,8 @@ mailutils mtr mutt microsocks nginx openlitespeed openssh pacman rsync socat tht : ${PKG_WEECHAT_VERSION:=2.7}; : ${PKG_WEECHAT_URL:=https://weechat.org/files/src/weechat-${PKG_WEECHAT_VERSION}.tar.gz}; : ${PKG_WEECHAT_CONFIGURE_ARGS_EXTRA:="--disable-aspell --disable-guile --disable-javascript --disable-lua --disable-perl --disable-python --disable-ruby --disable-tcl"}; +: ${PKG_WEECHAT_ENV_VARS_EXTRA:="CURL_CONFIG=${PREFIX_NATIVE}/bin/curl-config:LIBGCRYPT_CONFIG=${PREFIX_NATIVE}/bin/libgcrypt-config:PKGCONFIG=${DEFAULT_TARGET}-pkg-config"}; : ${PKG_WEECHAT_LDFLAGS_CONFIGURE_EXTRA:="-Wl,--as-needed -ltinfow -Wl,--no-as-needed"}; -: ${PKG_WEECHAT_ENV_VARS_EXTRA:="CURL_CONFIG=${PREFIX_NATIVE}/bin/curl-config:LIBGCRYPT_CONFIG=${PREFIX_NATIVE}/bin/libgcrypt-config"}; : ${PKG_WGET_SHA256SUM:=b39212abe1a73f2b28f4c6cb223c738559caac91d6e416a6d91d4b9d55c9faee}; : ${PKG_WGET_VERSION:=1.19.5}; : ${PKG_WGET_URL:=https://ftp.gnu.org/gnu/wget/wget-${PKG_WGET_VERSION}.tar.gz}; |