1 |
commit: 028f9596c072d426a3306af1bd083eb12e629fda |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jan 25 14:07:49 2019 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 25 14:10:02 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=028f9596 |
7 |
|
8 |
sys-libs/db: Bump to version 6.1.36 |
9 |
|
10 |
Package-Manager: Portage-2.3.58, Repoman-2.3.12 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
sys-libs/db/Manifest | 1 + |
14 |
sys-libs/db/db-6.1.36.ebuild | 242 +++++++++++++++++++++ |
15 |
.../db/files/db-4.3-listen-to-java-options.patch | 4 +- |
16 |
3 files changed, 245 insertions(+), 2 deletions(-) |
17 |
|
18 |
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest |
19 |
index d8fd85ce4af..2c9de6d4f74 100644 |
20 |
--- a/sys-libs/db/Manifest |
21 |
+++ b/sys-libs/db/Manifest |
22 |
@@ -12,6 +12,7 @@ DIST db-5.1.29.tar.gz 32188074 BLAKE2B 6af9e6afc0ebd06a43c0e96fd0b2b3c8e17476507 |
23 |
DIST db-5.3.28.tar.gz 35090431 BLAKE2B 5b77a4ec0945fa96ce6c2b452fb4b029295e037fa64d5ff8dcb3b5e01ee3501fd75d9a73b8f5fa54d8907717d93546fbb5348ee70119e877fa2f17d301ecf50d SHA512 e91bbe550fc147a8be7e69ade86fdb7066453814971b2b0223f7d17712bd029a8eff5b2b6b238042ff6ec1ffa6879d44cb95c5645a922fee305c26c3eeaee090 |
24 |
DIST db-6.0.35.tar.gz 36532251 BLAKE2B 22fbe557ccc13e4b936db8ca7d6ba11ce42e477bbf39f7e472067e06fb5910b1147fa58a44ac944c24a51ea839f1c61edda6bd8f3c450acac0c13d7fdba11e89 SHA512 002db1553def44efa715095b04b2bac2de7450cdc7142586d1d8b5d8ce79ee5e98f824b3bd276cd586ca932dc51ed35a9ffbed95b2b9847264f262cfa092479d |
25 |
DIST db-6.1.29.tar.gz 37521943 BLAKE2B 3f036647337a36cb5f8cf5cc8774bd49d4cdff2d57750f21488183de67e426ab0863ee97d972751adc10b294f6c23e1e5e3f2c7b3fc02616463f971b10f3b15e SHA512 ced40e357acd1214f8b5800ddcf084c65c0ab77ca045a4504ac1a4c864035bd50aa8993cd1232174ff81071a36806314807330aa53dcb18de548c886c2a99e73 |
26 |
+DIST db-6.1.36.tar.gz 37526795 BLAKE2B 9334dc66501465acf99f2675dc838a979c03a29b526b1d22fc9f811c6e76c5ecab4fafad4aa7efbc658c0bc64218f22ac4189c34bce866b0a4ffa052525607a6 SHA512 5f63eaaf75cad12c2a9b9f960bf39cb4ba6f8636609472f5909e38dccb65322a20104f0a8641b968c195c1b9a3ac5456c8bdaf3253995c9a4ace222a2e0d6811 |
27 |
DIST db-6.2.23.tar.gz 44305964 BLAKE2B 8d5705e8e4c66f93e52d1bee86a322ef6d2077d1e5c005208bedcb25f6cfd10e0a6d9c9a72a1d2e3568d6fec14ee82e2446a0fa0a0d505cc17f0ef245de826a1 SHA512 0aac380673ff4f97a2a6230f135f8151b8d2896a12710f708cd983b5fb95075b55fc2c67af577365e8ec7a32e43357a4f3118e37713d00b227f05eb11b1d12f5 |
28 |
DIST db-6.2.32.tar.gz 45342417 BLAKE2B d3254fba1300d6c7dda5d872c5fa349e8704d71be9c4d37ccf3357782adeb879ce30e066cf083bd97554405c2e94071a96cee16090ad9f797a4fa657ff7e8c46 SHA512 83bdbf18a7b9782409cf4563f8d5f11322d5e564a39946c890604a60440a6ea6361e0236bbc30bd4e8e1de1fa9196b8e815fd126baa035f55c5826c2c6aa3401 |
29 |
DIST db.1.85.tar.gz 270953 BLAKE2B 7862979b6fe21a67eac7eb5e0d05093f33fa71fa92f9717a65bd39b366727e6928109c821b86ede85d6d2a8013199f3927e760bed19001a5cfd2270819a3b904 SHA512 03bf3a2b0947efdca4e38719542e96378b5eeb57da64d5030dd23ab710773c1826f1c867032d0bea658b7fdd8272db253e97bbc490d198b9437025ffdf9e880e |
30 |
|
31 |
diff --git a/sys-libs/db/db-6.1.36.ebuild b/sys-libs/db/db-6.1.36.ebuild |
32 |
new file mode 100644 |
33 |
index 00000000000..4f1b84ebf02 |
34 |
--- /dev/null |
35 |
+++ b/sys-libs/db/db-6.1.36.ebuild |
36 |
@@ -0,0 +1,242 @@ |
37 |
+# Copyright 1999-2019 Gentoo Authors |
38 |
+# Distributed under the terms of the GNU General Public License v2 |
39 |
+ |
40 |
+EAPI=6 |
41 |
+inherit db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal eapi7-ver toolchain-funcs |
42 |
+ |
43 |
+#Number of official patches |
44 |
+#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"` |
45 |
+PATCHNO=${PV/*.*.*_p} |
46 |
+if [[ ${PATCHNO} == "${PV}" ]] ; then |
47 |
+ MY_PV=${PV} |
48 |
+ MY_P=${P} |
49 |
+ PATCHNO=0 |
50 |
+else |
51 |
+ MY_PV=${PV/_p${PATCHNO}} |
52 |
+ MY_P=${PN}-${MY_PV} |
53 |
+fi |
54 |
+ |
55 |
+S_BASE="${WORKDIR}/${MY_P}" |
56 |
+S="${S_BASE}/build_unix" |
57 |
+DESCRIPTION="Oracle Berkeley DB" |
58 |
+HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html" |
59 |
+SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz" |
60 |
+for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do |
61 |
+ export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}" |
62 |
+done |
63 |
+ |
64 |
+LICENSE="AGPL-3" |
65 |
+SLOT="$(get_version_component_range 1-2)" |
66 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" |
67 |
+IUSE="doc java cxx tcl test" |
68 |
+ |
69 |
+REQUIRED_USE="test? ( tcl )" |
70 |
+ |
71 |
+# the entire testsuite needs the TCL functionality |
72 |
+DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) |
73 |
+ test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) |
74 |
+ java? ( >=virtual/jdk-1.5 ) |
75 |
+ >=sys-devel/binutils-2.16.1" |
76 |
+RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) |
77 |
+ java? ( >=virtual/jre-1.5 )" |
78 |
+ |
79 |
+MULTILIB_WRAPPED_HEADERS=( |
80 |
+ /usr/include/db$(ver_cut 1-2)/db.h |
81 |
+) |
82 |
+ |
83 |
+PATCHES=( |
84 |
+ # bug #510506 |
85 |
+ "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch |
86 |
+ |
87 |
+ # use the includes from the prefix |
88 |
+ "${FILESDIR}"/${PN}-6.2-jni-check-prefix-first.patch |
89 |
+ "${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch |
90 |
+ |
91 |
+ # sqlite configure call has an extra leading .. |
92 |
+ # upstreamed:5.2.36, missing in 5.3.x/6.x |
93 |
+ # still needs to be patched in 6.0.20 |
94 |
+ "${FILESDIR}"/${PN}-6.1.19-sqlite-configure-path.patch |
95 |
+ |
96 |
+ # The upstream testsuite copies .lib and the binaries for each parallel test |
97 |
+ # core, ~300MB each. This patch uses links instead, saves a lot of space. |
98 |
+ "${FILESDIR}"/${PN}-6.0.20-test-link.patch |
99 |
+) |
100 |
+ |
101 |
+src_prepare() { |
102 |
+ cd "${WORKDIR}"/"${MY_P}" |
103 |
+ for (( i=1 ; i<=${PATCHNO} ; i++ )) |
104 |
+ do |
105 |
+ eapply "${DISTDIR}"/patch."${MY_PV}"."${i}" |
106 |
+ done |
107 |
+ |
108 |
+ default |
109 |
+ |
110 |
+ # Upstream release script grabs the dates when the script was run, so lets |
111 |
+ # end-run them to keep the date the same. |
112 |
+ export REAL_DB_RELEASE_DATE="$(awk \ |
113 |
+ '/^DB_VERSION_STRING=/{ gsub(".*\\(|\\).*","",$0); print $0; }' \ |
114 |
+ "${S_BASE}"/dist/configure)" |
115 |
+ sed -r -i \ |
116 |
+ -e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \ |
117 |
+ "${S_BASE}"/dist/RELEASE || die |
118 |
+ |
119 |
+ # Include the SLOT for Java JAR files |
120 |
+ # This supersedes the unused jarlocation patches. |
121 |
+ sed -r -i \ |
122 |
+ -e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \ |
123 |
+ "${S_BASE}"/dist/Makefile.in || die |
124 |
+ |
125 |
+ cd "${S_BASE}"/dist || die |
126 |
+ rm -f aclocal/libtool.m4 |
127 |
+ sed -i \ |
128 |
+ -e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \ |
129 |
+ configure.ac || die |
130 |
+ sed -i \ |
131 |
+ -e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \ |
132 |
+ aclocal/programs.m4 || die |
133 |
+ AT_M4DIR="aclocal aclocal_java" eautoreconf |
134 |
+ # Upstream sucks - they do autoconf and THEN replace the version variables. |
135 |
+ . ./RELEASE |
136 |
+ for v in \ |
137 |
+ DB_VERSION_{FAMILY,LETTER,RELEASE,MAJOR,MINOR} \ |
138 |
+ DB_VERSION_{PATCH,FULL,UNIQUE_NAME,STRING,FULL_STRING} \ |
139 |
+ DB_VERSION \ |
140 |
+ DB_RELEASE_DATE ; do |
141 |
+ local ev="__EDIT_${v}__" |
142 |
+ sed -i -e "s/${ev}/${!v}/g" configure || die |
143 |
+ done |
144 |
+ |
145 |
+ # This is a false positive skip in the tests as the test-reviewer code |
146 |
+ # looks for 'Skipping\s' |
147 |
+ sed -i \ |
148 |
+ -e '/db_repsite/s,Skipping:,Skipping,g' \ |
149 |
+ "${S_BASE}"/test/tcl/reputils.tcl || die |
150 |
+} |
151 |
+ |
152 |
+multilib_src_configure() { |
153 |
+ # sql_compat will cause a collision with sqlite3 |
154 |
+ # --enable-sql_compat |
155 |
+ # Don't --enable-sql* because we don't want to use bundled sqlite. |
156 |
+ # See Gentoo bug #605688 |
157 |
+ local myeconfargs=( |
158 |
+ --enable-compat185 |
159 |
+ --enable-dbm |
160 |
+ --enable-o_direct |
161 |
+ --without-uniquename |
162 |
+ --disable-sql |
163 |
+ --disable-sql_codegen |
164 |
+ --disable-sql_compat |
165 |
+ $([[ ${ABI} == arm ]] && echo --with-mutex=ARM/gcc-assembly) |
166 |
+ $([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly) |
167 |
+ $(use_enable cxx) |
168 |
+ $(use_enable cxx stl) |
169 |
+ $(multilib_native_use_enable java) |
170 |
+ $(use_enable test) |
171 |
+ ) |
172 |
+ |
173 |
+ tc-ld-disable-gold #470634 |
174 |
+ |
175 |
+ # compilation with -O0 fails on amd64, see bug #171231 |
176 |
+ if [[ ${ABI} == amd64 ]]; then |
177 |
+ local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS} |
178 |
+ replace-flags -O0 -O2 |
179 |
+ is-flagq -O[s123] || append-flags -O2 |
180 |
+ fi |
181 |
+ |
182 |
+ # Add linker versions to the symbols. Easier to do, and safer than header file |
183 |
+ # mumbo jumbo. |
184 |
+ if use userland_GNU ; then |
185 |
+ append-ldflags -Wl,--default-symver |
186 |
+ fi |
187 |
+ |
188 |
+ # use `set` here since the java opts will contain whitespace |
189 |
+ if multilib_is_native_abi && use java ; then |
190 |
+ myeconfargs+=( |
191 |
+ --with-java-prefix="${JAVA_HOME}" |
192 |
+ --with-javac-flags="$(java-pkg_javac-args)" |
193 |
+ ) |
194 |
+ fi |
195 |
+ |
196 |
+ # Bug #270851: test needs TCL support |
197 |
+ if use tcl || use test ; then |
198 |
+ myeconfargs+=( |
199 |
+ --enable-tcl |
200 |
+ --with-tcl="${EPREFIX}/usr/$(get_libdir)" |
201 |
+ ) |
202 |
+ else |
203 |
+ myeconfargs+=(--disable-tcl ) |
204 |
+ fi |
205 |
+ |
206 |
+ ECONF_SOURCE="${S_BASE}"/dist \ |
207 |
+ STRIP="true" \ |
208 |
+ econf "${myeconfargs[@]}" |
209 |
+} |
210 |
+ |
211 |
+multilib_src_install() { |
212 |
+ emake install DESTDIR="${D}" |
213 |
+ |
214 |
+ db_src_install_headerslot |
215 |
+ |
216 |
+ db_src_install_usrlibcleanup |
217 |
+ |
218 |
+ if multilib_is_native_abi && use java; then |
219 |
+ java-pkg_regso "${ED%/}"/usr/"$(get_libdir)"/libdb_java*.so |
220 |
+ java-pkg_dojar "${ED%/}"/usr/"$(get_libdir)"/*.jar |
221 |
+ rm -f "${ED%/}"/usr/"$(get_libdir)"/*.jar |
222 |
+ fi |
223 |
+} |
224 |
+ |
225 |
+multilib_src_install_all() { |
226 |
+ db_src_install_usrbinslot |
227 |
+ |
228 |
+ db_src_install_doc |
229 |
+ |
230 |
+ dodir /usr/sbin |
231 |
+ # This file is not always built, and no longer exists as of db-4.8 |
232 |
+ if [[ -f "${ED%/}"/usr/bin/berkeley_db_svc ]] ; then |
233 |
+ mv "${ED%/}"/usr/bin/berkeley_db_svc \ |
234 |
+ "${ED%/}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die |
235 |
+ fi |
236 |
+} |
237 |
+ |
238 |
+pkg_postinst() { |
239 |
+ multilib_foreach_abi db_fix_so |
240 |
+} |
241 |
+ |
242 |
+pkg_postrm() { |
243 |
+ multilib_foreach_abi db_fix_so |
244 |
+} |
245 |
+ |
246 |
+src_test() { |
247 |
+ # db_repsite is impossible to build, as upstream strips those sources. |
248 |
+ # db_repsite is used directly in the setup_site_prog, |
249 |
+ # setup_site_prog is called from open_site_prog |
250 |
+ # which is called only from tests in the multi_repmgr group. |
251 |
+ #sed -ri \ |
252 |
+ # -e '/set subs/s,multi_repmgr,,g' \ |
253 |
+ # "${S_BASE}/test/testparams.tcl" |
254 |
+ sed -ri \ |
255 |
+ -e '/multi_repmgr/d' \ |
256 |
+ "${S_BASE}/test/tcl/test.tcl" || die |
257 |
+ |
258 |
+ # This is the only failure in 5.2.28 so far, and looks like a false positive. |
259 |
+ # Repmgr018 (btree): Test of repmgr stats. |
260 |
+ # Repmgr018.a: Start a master. |
261 |
+ # Repmgr018.b: Start a client. |
262 |
+ # Repmgr018.c: Run some transactions at master. |
263 |
+ # Rep_test: btree 20 key/data pairs starting at 0 |
264 |
+ # Rep_test.a: put/get loop |
265 |
+ # FAIL:07:05:59 (00:00:00) perm_no_failed_stat: expected 0, got 1 |
266 |
+ sed -ri \ |
267 |
+ -e '/set parms.*repmgr018/d' \ |
268 |
+ -e 's/repmgr018//g' \ |
269 |
+ "${S_BASE}/test/tcl/test.tcl" || die |
270 |
+ |
271 |
+ multilib-minimal_src_test |
272 |
+} |
273 |
+ |
274 |
+multilib_src_test() { |
275 |
+ multilib_is_native_abi || return |
276 |
+ |
277 |
+ S=${BUILD_DIR} db_src_test |
278 |
+} |
279 |
|
280 |
diff --git a/sys-libs/db/files/db-4.3-listen-to-java-options.patch b/sys-libs/db/files/db-4.3-listen-to-java-options.patch |
281 |
index 8ddb46b7026..f1f701de126 100644 |
282 |
--- a/sys-libs/db/files/db-4.3-listen-to-java-options.patch |
283 |
+++ b/sys-libs/db/files/db-4.3-listen-to-java-options.patch |
284 |
@@ -1,5 +1,5 @@ |
285 |
---- dist/configure.ac 2005-09-23 21:01:26.000000000 +0200 |
286 |
-+++ dist/configure.ac 2005-09-23 20:59:20.000000000 +0200 |
287 |
+--- a/dist/configure.ac |
288 |
++++ b/dist/configure.ac |
289 |
@@ -385,6 +385,7 @@ |
290 |
# A classpath that includes . is needed to check for Java |
291 |
CLASSPATH=".:$CLASSPATH" |