Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 655302 | Differences between
and this patch

Collapse All | Expand All

(-)db-5.3.28-r3.ebuild (-27 / +30 lines)
Lines 1-8 Link Here
1
# Copyright 1999-2018 Gentoo Foundation
1
# Copyright 1999-2018 Gentoo Foundation
2
# Distributed under the terms of the GNU General Public License v2
2
# Distributed under the terms of the GNU General Public License v2
3
3
4
EAPI=5
4
EAPI=6
5
inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal toolchain-funcs
5
inherit db eapi7-ver flag-o-matic java-pkg-opt-2 autotools multilib-minimal toolchain-funcs
6
6
7
#Number of official patches
7
#Number of official patches
8
#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
8
#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
Lines 16-23 Link Here
16
	MY_P=${PN}-${MY_PV}
16
	MY_P=${PN}-${MY_PV}
17
fi
17
fi
18
18
19
S_BASE="${WORKDIR}/${MY_P}"
19
S="${WORKDIR}/${MY_P}"
20
S="${S_BASE}/build_unix"
20
BUILD_DIR="${S}/build${MULTIBUILD_VARIANT}"
21
DESCRIPTION="Oracle Berkeley DB"
21
DESCRIPTION="Oracle Berkeley DB"
22
HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html"
22
HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html"
23
SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz"
23
SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz"
Lines 26-32 Link Here
26
done
26
done
27
27
28
LICENSE="Sleepycat"
28
LICENSE="Sleepycat"
29
SLOT="5.3"
29
SLOT="$(ver_cut 1-2)"
30
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
30
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
31
IUSE="doc java cxx tcl test"
31
IUSE="doc java cxx tcl test"
32
32
Lines 41-90 Link Here
41
	java? ( >=virtual/jre-1.5 )"
41
	java? ( >=virtual/jre-1.5 )"
42
42
43
MULTILIB_WRAPPED_HEADERS=(
43
MULTILIB_WRAPPED_HEADERS=(
44
	/usr/include/db5.3/db.h
44
	/usr/include/db$(ver_cut 1-2)/db.h
45
)
45
)
46
46
47
src_prepare() {
47
PATCHES=()
48
	cd "${WORKDIR}"/"${MY_P}"
48
for (( i=1 ; i<=${PATCHNO} ; i++ ))
49
	for (( i=1 ; i<=${PATCHNO} ; i++ ))
49
do
50
	do
50
	PATCHES+=( "${DISTDIR}"/patch."${MY_PV}"."${i}" )
51
		epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
51
done
52
	done
52
PATCHES+=(
53
54
	# bug #510506
53
	# bug #510506
55
	epatch "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
54
	"${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
56
55
57
	# use the includes from the prefix
56
	# use the includes from the prefix
58
	epatch "${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch
57
	"${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch
59
	epatch "${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch
58
	"${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch
60
59
61
	# sqlite configure call has an extra leading ..
60
	# sqlite configure call has an extra leading ..
62
	# upstreamed:5.2.36, missing in 5.3.x
61
	# upstreamed:5.2.36, missing in 5.3.x
63
	epatch "${FILESDIR}"/${PN}-5.2.28-sqlite-configure-path.patch
62
	"${FILESDIR}"/${PN}-5.2.28-sqlite-configure-path.patch
64
63
65
	# The upstream testsuite copies .lib and the binaries for each parallel test
64
	# The upstream testsuite copies .lib and the binaries for each parallel test
66
	# core, ~300MB each. This patch uses links instead, saves a lot of space.
65
	# core, ~300MB each. This patch uses links instead, saves a lot of space.
67
	epatch "${FILESDIR}"/${PN}-6.0.20-test-link.patch
66
	"${FILESDIR}"/${PN}-6.0.20-test-link.patch
68
67
69
	# Needed when compiling with clang
68
	# Needed when compiling with clang
70
	epatch "${FILESDIR}"/${PN}-5.1.29-rename-atomic-compare-exchange.patch
69
	"${FILESDIR}"/${PN}-5.1.29-rename-atomic-compare-exchange.patch
70
)
71
72
src_prepare() {
73
	default
71
74
72
	# Upstream release script grabs the dates when the script was run, so lets
75
	# Upstream release script grabs the dates when the script was run, so lets
73
	# end-run them to keep the date the same.
76
	# end-run them to keep the date the same.
74
	export REAL_DB_RELEASE_DATE="$(awk \
77
	export REAL_DB_RELEASE_DATE="$(awk \
75
		'/^DB_VERSION_STRING=/{ gsub(".*\\(|\\).*","",$0); print $0; }' \
78
		'/^DB_VERSION_STRING=/{ gsub(".*\\(|\\).*","",$0); print $0; }' \
76
		"${S_BASE}"/dist/configure)"
79
		dist/configure)"
77
	sed -r -i \
80
	sed -r -i \
78
		-e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \
81
		-e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \
79
		"${S_BASE}"/dist/RELEASE || die
82
		dist/RELEASE || die
80
83
81
	# Include the SLOT for Java JAR files
84
	# Include the SLOT for Java JAR files
82
	# This supersedes the unused jarlocation patches.
85
	# This supersedes the unused jarlocation patches.
83
	sed -r -i \
86
	sed -r -i \
84
		-e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \
87
		-e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \
85
		"${S_BASE}"/dist/Makefile.in || die
88
		"${S}"/dist/Makefile.in || die
86
89
87
	cd "${S_BASE}"/dist || die
90
	cd dist || die
88
	rm -f aclocal/libtool.m4
91
	rm -f aclocal/libtool.m4
89
	sed -i \
92
	sed -i \
90
		-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
93
		-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
Lines 108-114 Link Here
108
	# looks for 'Skipping\s'
111
	# looks for 'Skipping\s'
109
	sed -i \
112
	sed -i \
110
		-e '/db_repsite/s,Skipping:,Skipping,g' \
113
		-e '/db_repsite/s,Skipping:,Skipping,g' \
111
		"${S_BASE}"/test/tcl/reputils.tcl || die
114
		"${S}"/test/tcl/reputils.tcl || die
112
}
115
}
113
116
114
multilib_src_configure() {
117
multilib_src_configure() {
Lines 151-157 Link Here
151
	# --enable-sql_compat
154
	# --enable-sql_compat
152
	# Don't --enable-sql* because we don't want to use bundled sqlite.
155
	# Don't --enable-sql* because we don't want to use bundled sqlite.
153
	# See Gentoo bug #605688
156
	# See Gentoo bug #605688
154
	ECONF_SOURCE="${S_BASE}"/dist \
157
	ECONF_SOURCE="${S}"/dist \
155
	STRIP="true" \
158
	STRIP="true" \
156
	econf \
159
	econf \
157
		--enable-compat185 \
160
		--enable-compat185 \
Lines 215-221 Link Here
215
	#	"${S_BASE}/test/testparams.tcl"
218
	#	"${S_BASE}/test/testparams.tcl"
216
	sed -ri \
219
	sed -ri \
217
		-e '/multi_repmgr/d' \
220
		-e '/multi_repmgr/d' \
218
		"${S_BASE}/test/tcl/test.tcl" || die
221
		"${S}/test/tcl/test.tcl" || die
219
222
220
	# This is the only failure in 5.2.28 so far, and looks like a false positive.
223
	# This is the only failure in 5.2.28 so far, and looks like a false positive.
221
	# Repmgr018 (btree): Test of repmgr stats.
224
	# Repmgr018 (btree): Test of repmgr stats.
Lines 228-234 Link Here
228
	sed -ri \
231
	sed -ri \
229
		-e '/set parms.*repmgr018/d' \
232
		-e '/set parms.*repmgr018/d' \
230
		-e 's/repmgr018//g' \
233
		-e 's/repmgr018//g' \
231
		"${S_BASE}/test/tcl/test.tcl" || die
234
		"${S}/test/tcl/test.tcl" || die
232
235
233
	multilib-minimal_src_test
236
	multilib-minimal_src_test
234
}
237
}

Return to bug 655302