diff options
| author | Lucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de> | 2017-11-22 15:09:54 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de> | 2017-11-22 15:09:54 +0000 |
| commit | 14c984b00aece1050b63288fe5856854ebcbb352 (patch) | |
| tree | 83321486b9d962b1fe395e51cf3746092007019b | |
| parent | 22d45aebd6f886f179c6444ea968ca492f228b89 (diff) | |
| download | midipix_build-14c984b00aece1050b63288fe5856854ebcbb352.tar.bz2 midipix_build-14c984b00aece1050b63288fe5856854ebcbb352.tar.xz | |
vars/build.vars, patches/weechat-1.6.local.patch: fix linking against libgcrypt.
| -rw-r--r-- | patches/weechat-1.6.local.patch | 16 | ||||
| -rw-r--r-- | vars/build.vars | 2 |
2 files changed, 10 insertions, 8 deletions
diff --git a/patches/weechat-1.6.local.patch b/patches/weechat-1.6.local.patch index ea5b7125..e1db0791 100644 --- a/patches/weechat-1.6.local.patch +++ b/patches/weechat-1.6.local.patch @@ -1,15 +1,17 @@ ---- weechat-1.6/configure.orig 2016-11-15 19:19:45.531918300 +0100 -+++ weechat-1.6/configure 2016-11-15 19:23:22.078226900 +0100 -@@ -23683,7 +23683,7 @@ +--- weechat-1.6/configure.orig 2017-11-22 14:47:17.644000000 +0000 ++++ weechat-1.6/configure 2017-11-22 15:05:58.224000000 +0000 +@@ -24277,8 +24277,8 @@ + else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - GCRYPT_CFLAGS=`libgcrypt-config --cflags` +- GCRYPT_CFLAGS=`libgcrypt-config --cflags` - GCRYPT_LFLAGS=`libgcrypt-config --libs` -+ GCRYPT_LFLAGS="-lgcrypt -lgpg-error" ++ GCRYPT_CFLAGS=`${LIBGCRYPT_CONFIG} --cflags` ++ GCRYPT_LFLAGS=`${LIBGCRYPT_CONFIG} --libs` fi -@@ -23760,8 +23760,8 @@ +@@ -24355,8 +24355,8 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -20,7 +22,7 @@ $as_echo "#define HAVE_GNUTLS 1" >>confdefs.h -@@ -23972,8 +23972,8 @@ +@@ -24567,8 +24567,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 630f85b9..ba7b0c42 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -873,7 +873,7 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_WEECHAT_VERSION:=1.6}; : ${PKG_WEECHAT_URL:=https://weechat.org/files/src/weechat-${PKG_WEECHAT_VERSION}.tar.gz}; : ${PKG_WEECHAT_CONFIGURE_ARGS_EXTRA:="--disable-python --disable-python3 --disable-ruby --disable-tcl"}; -: ${PKG_WEECHAT_ENV_VARS_EXTRA:="CURL_CONFIG=${PREFIX_NATIVE}/bin/curl-config"}; +: ${PKG_WEECHAT_ENV_VARS_EXTRA:="CURL_CONFIG=${PREFIX_NATIVE}/bin/curl-config:LIBGCRYPT_CONFIG=${PREFIX_NATIVE}/bin/libgcrypt-config"}; : ${PKG_WEECHAT_LDFLAGS_BUILD_EXTRA:=-L${PREFIX_NATIVE}/lib}; : ${PKG_WGET_SHA256SUM:=4f4a673b6d466efa50fbfba796bd84a46ae24e370fa562ede5b21ab53c11a920}; : ${PKG_WGET_VERSION:=1.19.2}; |