From a938a964374e185fc50187e1bb66336cd6cdd8c6 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Fri, 22 Apr 2016 03:25:58 -0400 Subject: [PATCH] weechat: Add perl plugin (weechat-perl-plugin pkg) Fixes #210. --- packages/weechat/build.sh | 3 +- packages/weechat/cmake-FindPerl.cmake.patch | 74 ++++++++++++++++++++++ packages/weechat/weechat-perl-plugin.subpackage.sh | 3 + 3 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 packages/weechat/cmake-FindPerl.cmake.patch create mode 100644 packages/weechat/weechat-perl-plugin.subpackage.sh diff --git a/packages/weechat/build.sh b/packages/weechat/build.sh index 4a8835e0..cb236d55 100755 --- a/packages/weechat/build.sh +++ b/packages/weechat/build.sh @@ -1,7 +1,7 @@ TERMUX_PKG_HOMEPAGE=http://weechat.org/ TERMUX_PKG_DESCRIPTION="Fast, light and extensible IRC chat client" TERMUX_PKG_VERSION=1.4 -TERMUX_PKG_BUILD_REVISION=2 +TERMUX_PKG_BUILD_REVISION=3 TERMUX_PKG_SRCURL=http://www.weechat.org/files/src/weechat-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_DEPENDS="ncurses, libgcrypt, libcurl, libgnutls, libandroid-support" # weechat-curses is a symlink to weechat, so remove it: @@ -30,6 +30,7 @@ termux_step_configure () { -DENABLE_LUA=OFF \ -DENABLE_MAN=ON \ -DENABLE_PYTHON3=ON \ + -DENABLE_PERL=ON \ -DENABLE_TCL=OFF \ $TERMUX_PKG_SRCDIR } diff --git a/packages/weechat/cmake-FindPerl.cmake.patch b/packages/weechat/cmake-FindPerl.cmake.patch new file mode 100644 index 00000000..3ebb260d --- /dev/null +++ b/packages/weechat/cmake-FindPerl.cmake.patch @@ -0,0 +1,74 @@ +diff -u -r ../weechat-1.4/cmake/FindPerl.cmake ./cmake/FindPerl.cmake +--- ../weechat-1.4/cmake/FindPerl.cmake 2016-01-10 03:17:50.000000000 -0500 ++++ ./cmake/FindPerl.cmake 2016-04-21 22:40:24.209760454 -0400 +@@ -28,57 +28,16 @@ + # PERL_CFLAGS = perl compiler options for compiling + # PERL_LFLAGS = perl compiler options for linking + +-if(PERL_FOUND) +- # Already in cache, be silent +- set(PERL_FIND_QUIETLY TRUE) +-endif() +- +-find_program(PERL_EXECUTABLE +- NAMES perl perl5 +- PATHS /usr/bin /usr/local/bin /usr/pkg/bin +- ) +- +-if(PERL_EXECUTABLE) +- +- execute_process( +- COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \"\$Config{archlibexp}/CORE\"" +- OUTPUT_VARIABLE PERL_INTERNAL_DIR +- ) +- +- execute_process( +- COMMAND ${PERL_EXECUTABLE} -MExtUtils::Embed -e ccopts +- OUTPUT_VARIABLE PERL_CFLAGS +- ) +- +- execute_process( +- COMMAND ${PERL_EXECUTABLE} -MExtUtils::Embed -e ldopts +- OUTPUT_VARIABLE PERL_LFLAGS +- ) +- +- # remove the new lines from the output by replacing them with empty strings +- string(REPLACE "\n" "" PERL_INTERNAL_DIR "${PERL_INTERNAL_DIR}") +- string(REPLACE "\n" "" PERL_CFLAGS "${PERL_CFLAGS}") +- string(REPLACE "\n" "" PERL_LFLAGS "${PERL_LFLAGS}") +- +- find_path(PERL_INCLUDE_PATH +- NAMES perl.h +- PATHS ${PERL_INTERNAL_DIR} +- ) +- +- find_library(PERL_LIBRARY +- NAMES perl +- PATHS /usr/lib /usr/local/lib /usr/pkg/lib ${PERL_INTERNAL_DIR} +- ) +- +- if(PERL_LIBRARY AND PERL_INCLUDE_PATH) +- set(PERL_FOUND TRUE) +- endif() +- +- mark_as_advanced( +- PERL_EXECUTABLE +- PERL_INCLUDE_PATH +- PERL_LIBRARY +- PERL_CFLAGS +- PERL_LFLAGS +- ) +-endif() ++set(PERL_EXECUTABLE "@TERMUX_PREFIX@/bin/perl") ++set(PERL_INCLUDE_PATH "@TERMUX_PREFIX@/include/perl/") ++set(PERL_LIBRARY "@TERMUX_PREFIX@/lib") ++set(PERL_LFLAGS "-lperl") ++set(PERL_FOUND TRUE) ++ ++mark_as_advanced( ++ PERL_EXECUTABLE ++ PERL_INCLUDE_PATH ++ PERL_LIBRARY ++ PERL_CFLAGS ++ PERL_LFLAGS ++) diff --git a/packages/weechat/weechat-perl-plugin.subpackage.sh b/packages/weechat/weechat-perl-plugin.subpackage.sh new file mode 100644 index 00000000..72205a53 --- /dev/null +++ b/packages/weechat/weechat-perl-plugin.subpackage.sh @@ -0,0 +1,3 @@ +TERMUX_SUBPKG_INCLUDE="lib/weechat/plugins/perl.so" +TERMUX_SUBPKG_DESCRIPTION="WeeChat Perl Plugin" +TERMUX_SUBPKG_DEPENDS="weechat, perl" -- 2.11.0