diff options
| -rw-r--r-- | groups/241.native_packages_inet.group | 4 | ||||
| -rw-r--r-- | patches/weechat-3.6_pre.local.patch | 53 |
2 files changed, 55 insertions, 2 deletions
diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group index 8ef624d0..62d2cfb3 100644 --- a/groups/241.native_packages_inet.group +++ b/groups/241.native_packages_inet.group @@ -239,11 +239,11 @@ mutt_cv_regex_broken=no"}; : ${PKG_W3M_IN_TREE:=1}; : ${PKG_W3M_MAKEFLAGS_BUILD:=-j1}; : ${PKG_W3M_SUBDIR:=w3m-0.5.3-git20190105}; -: ${PKG_WEECHAT_DEPENDS:="curl gnutls libgcrypt libz ncursesw"}; +: ${PKG_WEECHAT_DEPENDS:="curl gnutls libgcrypt libz ncursesw perl"}; : ${PKG_WEECHAT_SHA256SUM:=f095f452aca0a92d86f46db74d712a890bca130fe1f20f7fad6e515b5c3be644}; : ${PKG_WEECHAT_VERSION:=3.6}; : ${PKG_WEECHAT_URL:=https://weechat.org/files/src/weechat-${PKG_WEECHAT_VERSION}.tar.gz}; -: ${PKG_WEECHAT_CONFIGURE_ARGS_EXTRA:="--disable-guile --disable-javascript --disable-perl --disable-python --disable-ruby --disable-tcl"}; +: ${PKG_WEECHAT_CONFIGURE_ARGS_EXTRA:="--disable-guile --disable-javascript --disable-python --disable-ruby --disable-tcl --enable-perl PERL_CFLAGS=-I${PREFIX_NATIVE}/lib/perl5/5.36.0/${DEFAULT_TARGET}/CORE PERL_LFLAGS=-lperl"}; : ${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_CFLAGS_CONFIGURE_EXTRA:="-I${PREFIX_NATIVE}/include/lua5.4 -I${PREFIX_NATIVE}/include/php -I${PREFIX_NATIVE}/include/php/main -I${PREFIX_NATIVE}/include/php/Zend -I${PREFIX_NATIVE}/include/php/TSRM"}; : ${PKG_WEECHAT_LDFLAGS_CONFIGURE_EXTRA:="-Wl,--as-needed -ltinfow -Wl,--no-as-needed"}; diff --git a/patches/weechat-3.6_pre.local.patch b/patches/weechat-3.6_pre.local.patch index 1144a869..dd37cde4 100644 --- a/patches/weechat-3.6_pre.local.patch +++ b/patches/weechat-3.6_pre.local.patch @@ -20,6 +20,59 @@ diff -ru weechat-2.9.orig/configure.ac weechat-2.9/configure.ac # dynamic loader # ------------------------------------------------------------------------------ +@@ -398,52 +398,6 @@ + + # ---------------------------------- perl -------------------------------------- + +-PERL_VERSION= +- +-if test "x$enable_perl" = "xyes" ; then +- AC_PATH_PROGS(PERL, perl perl5) +- if test -z $PERL ; then +- AC_MSG_WARN([ +-*** Perl must be installed on your system but perl interpreter couldn't be found in path. +-*** Please check that perl is in path, or install it with your software package manager. +-*** WeeChat will be built without Perl support.]) +- enable_perl="no" +- not_found="$not_found perl" +- else +- PERL_VERSION=`perl -V:version | sed "s/version='\(.*\)';/\1/"` +- AC_MSG_CHECKING(for Perl headers files) +- +- PERL_HEADER_TEST=`PT=perltest.c ; echo "#include <EXTERN.h>" > $PT; echo "#include <perl.h>" >> $PT; echo "#include <XSUB.h>" >> $PT ; echo "int main() { return 0; }" >> $PT ; $CC -Wall $PT -o $PT.out $($PERL -MExtUtils::Embed -e ccopts -e ldopts) 1>/dev/null 2>&1; echo $?; rm -f $PT $PT.out 1>/dev/null 2>&1` +- +- if test "x$PERL_HEADER_TEST" = "x0" ; then +- PERL_CFLAGS=`$PERL -MExtUtils::Embed -e ccopts` +- AC_MSG_RESULT(found) +- AC_MSG_CHECKING(for Perl library) +- PERL_LIB_TEST=`PT=perltest.c ; echo "int main() { return 0; }" > $PT ; $CC -Wall $PT -o $PT.out $($PERL -MExtUtils::Embed -e ldopts) 1>/dev/null 2>&1; echo $?; rm -f $PT $PT.out 1>/dev/null 2>&1` +- if test "x$PERL_LIB_TEST" = "x0" ; then +- PERL_LFLAGS=`$PERL -MExtUtils::Embed -e ldopts` +- AC_MSG_RESULT(found) +- else +- AC_MSG_WARN([ +-*** Perl library couldn't be found on your system. +-*** Try to install it with your software package manager. +-*** WeeChat will be built without Perl support.]) +- enable_perl="no" +- not_found="$not_found perl" +- fi +- else +- AC_MSG_WARN([ +-*** Perl headers couldn't be found on your system. +-*** Try to install it with your software package manager. +-*** WeeChat will be built without Perl support.]) +- enable_perl="no" +- not_found="$not_found perl" +- fi +- fi +-else +- not_asked="$not_asked perl" +-fi +- + if test "x$enable_perl" = "xyes" ; then + AC_SUBST(PERL_CFLAGS) + AC_SUBST(PERL_LFLAGS) @@ -1049,8 +1037,8 @@ *** or try to install it with your software package manager.]) else |