Browse Source

Merge pull request #3711 from termux/libpcreposix

pcre: add subpkg libpcreposix
emacs-27
Henrik Grimler 6 years ago
committed by GitHub
parent
commit
d116730a02
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      packages/pcre/build.sh
  2. 2
      packages/pcre/libpcreposix.subpackage.sh
  3. 4
      packages/privoxy/build.sh
  4. 12
      packages/privoxy/configure.in.patch

3
packages/pcre/build.sh

@ -3,7 +3,8 @@ TERMUX_PKG_DESCRIPTION="Library implementing regular expression pattern matching
TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_LICENSE="BSD 3-Clause"
TERMUX_PKG_VERSION=8.43 TERMUX_PKG_VERSION=8.43
TERMUX_PKG_SHA256=91e762520003013834ac1adb4a938d53b22a216341c061b0cf05603b290faf6b TERMUX_PKG_SHA256=91e762520003013834ac1adb4a938d53b22a216341c061b0cf05603b290faf6b
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://ftp.pcre.org/pub/pcre/pcre-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SRCURL=https://ftp.pcre.org/pub/pcre/pcre-${TERMUX_PKG_VERSION}.tar.bz2
TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="bin/pcre-config" TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="bin/pcre-config"
TERMUX_PKG_RM_AFTER_INSTALL="bin/pcregrep bin/pcretest share/man/man1/pcre*.1 lib/libpcreposix.so lib/libpcreposix.so.0 lib/libpcreposix.so.0.0.2" TERMUX_PKG_RM_AFTER_INSTALL="bin/pcregrep bin/pcretest share/man/man1/pcre*.1"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-cpp --enable-jit --enable-utf8 --enable-unicode-properties" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-cpp --enable-jit --enable-utf8 --enable-unicode-properties"

2
packages/pcre/libpcreposix.subpackage.sh

@ -0,0 +1,2 @@
TERMUX_SUBPKG_INCLUDE="lib/libpcreposix.so*"
TERMUX_SUBPKG_DESCRIPTION="Posix-compatible runtime libraries for libpcre"

4
packages/privoxy/build.sh

@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.privoxy.org
TERMUX_PKG_DESCRIPTION="Non-caching web proxy with advanced filtering capabilities" TERMUX_PKG_DESCRIPTION="Non-caching web proxy with advanced filtering capabilities"
TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_VERSION=3.0.28 TERMUX_PKG_VERSION=3.0.28
TERMUX_PKG_REVISION=1 TERMUX_PKG_REVISION=2
TERMUX_PKG_SHA256=b5d78cc036aaadb3b7cf860e9d598d7332af468926a26e2d56167f1cb6f2824a TERMUX_PKG_SHA256=b5d78cc036aaadb3b7cf860e9d598d7332af468926a26e2d56167f1cb6f2824a
TERMUX_PKG_SRCURL=https://www.privoxy.org/sf-download-mirror/Sources/$TERMUX_PKG_VERSION%20%28stable%29/privoxy-$TERMUX_PKG_VERSION-stable-src.tar.gz TERMUX_PKG_SRCURL=https://www.privoxy.org/sf-download-mirror/Sources/$TERMUX_PKG_VERSION%20%28stable%29/privoxy-$TERMUX_PKG_VERSION-stable-src.tar.gz
TERMUX_PKG_CONFFILES='etc/privoxy/config etc/privoxy/match-all.action etc/privoxy/trust etc/privoxy/user.action etc/privoxy/user.filter etc/privoxy/default.action etc/privoxy/default.filter' TERMUX_PKG_CONFFILES='etc/privoxy/config etc/privoxy/match-all.action etc/privoxy/trust etc/privoxy/user.action etc/privoxy/user.filter etc/privoxy/default.action etc/privoxy/default.filter'
@ -10,7 +10,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
ac_cv_lib_pcreposix_regcomp=no ac_cv_lib_pcreposix_regcomp=no
--sysconfdir=$TERMUX_PREFIX/etc/privoxy --sysconfdir=$TERMUX_PREFIX/etc/privoxy
" "
TERMUX_PKG_DEPENDS="pcre, zlib" TERMUX_PKG_DEPENDS="pcre, libpcreposix, zlib"
TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_BUILD_IN_SRC=yes
TERMUX_PKG_KEEP_SHARE_DOC=yes TERMUX_PKG_KEEP_SHARE_DOC=yes

12
packages/privoxy/configure.in.patch

@ -1,12 +0,0 @@
diff -u -r ../privoxy-3.0.28-stable/configure.in ./configure.in
--- ../privoxy-3.0.28-stable/configure.in 2018-12-30 18:40:13.000000000 +0000
+++ ./configure.in 2019-01-02 23:35:39.728797247 +0000
@@ -1092,7 +1092,7 @@
pcre_dyn=yes
AC_DEFINE(FEATURE_DYNAMIC_PCRE,1,[Define to dynamically link to pcre.])
STATIC_PCRE_ONLY=#
- LIBS="$LIBS -lpcre -lpcreposix"
+ LIBS="$LIBS -lpcre"
else
AC_MSG_WARN([You are using the static PCRE code which is out of date and scheduled for removal, for details see:
http://sourceforge.net/mailarchive/forum.php?thread_name=20080511195555.2dc6cfdc%40fabiankeil.de&forum_name=ijbswa-developers])
Loading…
Cancel
Save