1 |
commit: 378165b144d4c9d0fe540d82ed064ca46b045dab |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Apr 10 06:17:00 2019 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Apr 10 06:18:31 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=378165b1 |
7 |
|
8 |
Revert "dev-libs/libpcre: Removed old" |
9 |
|
10 |
This reverts commit 738937f1dd8819af159f52452fcd6fd93468f7da. |
11 |
|
12 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
13 |
|
14 |
dev-libs/libpcre/Manifest | 1 + |
15 |
...bpcre-8.41-sljit_mips-label-statement-fix.patch | 15 ++++ |
16 |
dev-libs/libpcre/libpcre-8.41-r1.ebuild | 100 +++++++++++++++++++++ |
17 |
3 files changed, 116 insertions(+) |
18 |
|
19 |
diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest |
20 |
index 79a8a6acc0b..78c057db7ae 100644 |
21 |
--- a/dev-libs/libpcre/Manifest |
22 |
+++ b/dev-libs/libpcre/Manifest |
23 |
@@ -1,2 +1,3 @@ |
24 |
+DIST pcre-8.41.tar.bz2 1561874 BLAKE2B 2a97a859237994137190da00c30ba7c15e8631b82b7f200858cf722f1fdd0405d36c24bb716eb099d8107f2f829a85fd7d3497f36cdac51769636989331e7a79 SHA512 cc9cdbeb98c010fe4f093a019bebfb91965dae4c6a48f8e49c38ec8df7d9da7f0d32c12fc58f22c51f1c2f010e72b65bcbf8bbf180060e93edf464fa9a7c3551 |
25 |
DIST pcre-8.42.tar.bz2 1570171 BLAKE2B f68bac3cf8ff5a81ccba31fd4d8926e05143a25a756e7daba9793467cec9cd8a4766f394f958ffca088b472463a43a31ea77014f2d4505082c1f366a18f30c7a SHA512 b47b923108f6ee0c31409b79d0888314271b482a22590e164d02f21d2112fba22dd0342c24f9ba0f5fcc5b8c65550bad08c476e30a2fc79b34ecf4601ed82f3d |
26 |
DIST pcre-8.43.tar.bz2 1576584 BLAKE2B 12c2117fc5d242ada44884df279f7f8b4c680fa1623ddc131c0adca1740ec47614ac6af20fc60b0c516d9d7b66488ba8a4e5efa5fc8a0a70aacb02bb3d38ee53 SHA512 3b4ac2c7ccd77c9575d07a33c3456f40b50731029e62d01fb8f2f5871d7118e12bc9e6bc7a8079769c765e38da5ecf98c4b261b10ff0a2f14f0881b434f67af7 |
27 |
|
28 |
diff --git a/dev-libs/libpcre/files/libpcre-8.41-sljit_mips-label-statement-fix.patch b/dev-libs/libpcre/files/libpcre-8.41-sljit_mips-label-statement-fix.patch |
29 |
new file mode 100644 |
30 |
index 00000000000..0494ccc25eb |
31 |
--- /dev/null |
32 |
+++ b/dev-libs/libpcre/files/libpcre-8.41-sljit_mips-label-statement-fix.patch |
33 |
@@ -0,0 +1,15 @@ |
34 |
+diff -Naurp pcre-8.41.orig/sljit/sljitNativeMIPS_common.c pcre-8.41/sljit/sljitNativeMIPS_common.c |
35 |
+--- pcre-8.41.orig/sljit/sljitNativeMIPS_common.c 2017-05-07 11:32:25.000000000 -0400 |
36 |
++++ pcre-8.41/sljit/sljitNativeMIPS_common.c 2017-07-29 17:50:24.508909742 -0400 |
37 |
+@@ -503,9 +503,11 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit |
38 |
+ #ifdef SLJIT_IS_FPU_AVAILABLE |
39 |
+ return SLJIT_IS_FPU_AVAILABLE; |
40 |
+ #elif defined(__GNUC__) |
41 |
++ { |
42 |
+ sljit_sw fir; |
43 |
+ asm ("cfc1 %0, $0" : "=r"(fir)); |
44 |
+ return (fir >> 22) & 0x1; |
45 |
++ } |
46 |
+ #else |
47 |
+ #error "FIR check is not implemented for this architecture" |
48 |
+ #endif |
49 |
|
50 |
diff --git a/dev-libs/libpcre/libpcre-8.41-r1.ebuild b/dev-libs/libpcre/libpcre-8.41-r1.ebuild |
51 |
new file mode 100644 |
52 |
index 00000000000..d6f935a21d8 |
53 |
--- /dev/null |
54 |
+++ b/dev-libs/libpcre/libpcre-8.41-r1.ebuild |
55 |
@@ -0,0 +1,100 @@ |
56 |
+# Copyright 1999-2018 Gentoo Foundation |
57 |
+# Distributed under the terms of the GNU General Public License v2 |
58 |
+ |
59 |
+EAPI=5 |
60 |
+ |
61 |
+inherit eutils multilib libtool flag-o-matic toolchain-funcs multilib-minimal |
62 |
+ |
63 |
+DESCRIPTION="Perl-compatible regular expression library" |
64 |
+HOMEPAGE="http://www.pcre.org/" |
65 |
+MY_P="pcre-${PV/_rc/-RC}" |
66 |
+if [[ ${PV} != *_rc* ]] ; then |
67 |
+ # Only the final releases are available here. |
68 |
+ SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2 |
69 |
+ ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2" |
70 |
+else |
71 |
+ SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Testing/${MY_P}.tar.bz2" |
72 |
+fi |
73 |
+ |
74 |
+LICENSE="BSD" |
75 |
+SLOT="3" |
76 |
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
77 |
+IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib" |
78 |
+REQUIRED_USE="readline? ( !libedit ) |
79 |
+ libedit? ( !readline )" |
80 |
+ |
81 |
+RDEPEND=" |
82 |
+ bzip2? ( app-arch/bzip2 ) |
83 |
+ zlib? ( sys-libs/zlib ) |
84 |
+ libedit? ( dev-libs/libedit ) |
85 |
+ readline? ( sys-libs/readline:0= ) |
86 |
+" |
87 |
+DEPEND=" |
88 |
+ ${RDEPEND} |
89 |
+ virtual/pkgconfig |
90 |
+" |
91 |
+RDEPEND=" |
92 |
+ ${RDEPEND} |
93 |
+" |
94 |
+ |
95 |
+S="${WORKDIR}/${MY_P}" |
96 |
+ |
97 |
+MULTILIB_CHOST_TOOLS=( |
98 |
+ /usr/bin/pcre-config |
99 |
+) |
100 |
+ |
101 |
+PATCHES=( |
102 |
+ "${FILESDIR}"/${PN}-8.41-sljit_mips-label-statement-fix.patch |
103 |
+ "${FILESDIR}"/${PN}-8.41-fix-stack-size-detection.patch |
104 |
+) |
105 |
+ |
106 |
+src_prepare() { |
107 |
+ epatch "${PATCHES[@]}" |
108 |
+ sed -i -e "s:-lpcre ::" libpcrecpp.pc.in || die |
109 |
+ elibtoolize |
110 |
+} |
111 |
+ |
112 |
+multilib_src_configure() { |
113 |
+ local myeconfargs=( |
114 |
+ --with-match-limit-recursion=$(usex recursion-limit 8192 MATCH_LIMIT) |
115 |
+ $(multilib_native_use_enable bzip2 pcregrep-libbz2) |
116 |
+ $(use_enable cxx cpp) |
117 |
+ $(use_enable jit) $(use_enable jit pcregrep-jit) |
118 |
+ $(use_enable pcre16) |
119 |
+ $(use_enable pcre32) |
120 |
+ $(multilib_native_use_enable libedit pcretest-libedit) |
121 |
+ $(multilib_native_use_enable readline pcretest-libreadline) |
122 |
+ $(use_enable static-libs static) |
123 |
+ $(use_enable unicode utf) $(use_enable unicode unicode-properties) |
124 |
+ $(multilib_native_use_enable zlib pcregrep-libz) |
125 |
+ --enable-pcre8 |
126 |
+ --enable-shared |
127 |
+ --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html |
128 |
+ --docdir="${EPREFIX}"/usr/share/doc/${PF} |
129 |
+ ) |
130 |
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
131 |
+} |
132 |
+ |
133 |
+multilib_src_compile() { |
134 |
+ emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=") |
135 |
+} |
136 |
+ |
137 |
+multilib_src_install() { |
138 |
+ emake \ |
139 |
+ DESTDIR="${D}" \ |
140 |
+ $(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \ |
141 |
+ install |
142 |
+ gen_usr_ldscript -a pcre |
143 |
+} |
144 |
+ |
145 |
+multilib_src_install_all() { |
146 |
+ prune_libtool_files |
147 |
+} |
148 |
+ |
149 |
+pkg_preinst() { |
150 |
+ preserve_old_lib /$(get_libdir)/libpcre.so.0 |
151 |
+} |
152 |
+ |
153 |
+pkg_postinst() { |
154 |
+ preserve_old_lib_notify /$(get_libdir)/libpcre.so.0 |
155 |
+} |