Diff db-5.3.28-r11 with a db-6.0.35-r4

/usr/portage/sys-libs/db/db-6.0.35-r4.ebuild 2024-12-25 14:59:52.815270184 +0300
1
# Copyright 1999-2025 Gentoo Authors
1
# Copyright 1999-2024 Gentoo Authors
2 2
# Distributed under the terms of the GNU General Public License v2
3 3

  
4 4
EAPI=7
......
21 21
S_BASE="${WORKDIR}/${MY_P}"
22 22
S="${S_BASE}/build_unix"
23 23
DESCRIPTION="Oracle Berkeley DB"
24
HOMEPAGE="https://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html"
25
SRC_URI="https://download.oracle.com/berkeley-db/${MY_P}.tar.gz"
24
HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html"
25
SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz"
26 26
for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do
27
	SRC_URI+=" https://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}"
27
	SRC_URI+=" http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}"
28 28
done
29 29

  
30
LICENSE="Sleepycat"
30
LICENSE="AGPL-3"
31 31
SLOT="$(ver_cut 1-2)"
32
KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
32
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
33 33
IUSE="doc cxx tcl test"
34 34

  
35 35
REQUIRED_USE="test? ( tcl )"
......
38 38
DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
39 39
	test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )"
40 40
RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )"
41
# bug #841698
42 41
# Need binutils for tc-ld-force-bfd
43
BDEPEND="
44
	dev-build/autoconf-archive
45
	sys-devel/binutils:*
46
"
42
BDEPEND="sys-devel/binutils:*"
47 43

  
48 44
MULTILIB_WRAPPED_HEADERS=(
49 45
	/usr/include/db${SLOT}/db.h
......
51 47

  
52 48
PATCHES=(
53 49
	# sqlite configure call has an extra leading ..
54
	# upstreamed:5.2.36, missing in 5.3.x
55
	"${FILESDIR}"/${PN}-5.2.28-sqlite-configure-path.patch
50
	# upstreamed:5.2.36, missing in 5.3.x/6.x
51
	# still needs to be patched in 6.0.20
52
	"${FILESDIR}"/${PN}-6.0.35-sqlite-configure-path.patch
56 53

  
57 54
	# The upstream testsuite copies .lib and the binaries for each parallel test
58 55
	# core, ~300MB each. This patch uses links instead, saves a lot of space.
59 56
	"${FILESDIR}"/${PN}-6.0.20-test-link.patch
60

  
61
	# Needed when compiling with clang
62
	"${FILESDIR}"/${PN}-5.1.29-rename-atomic-compare-exchange.patch
63
	"${FILESDIR}"/${PN}-5.3.28-modern-c.patch
64
	"${FILESDIR}"/${PN}-4.8.30-tls-configure.patch
65 57
)
66 58

  
67 59
src_prepare() {
......
122 114

  
123 115
multilib_src_configure() {
124 116
	local myconf=(
125
		# sql_compat will cause a collision with sqlite3
126
		#--enable-sql_compat
127
		# Don't --enable-sql* because we don't want to use bundled sqlite.
128
		# See Gentoo bug #605688
129 117
		--enable-compat185
130 118
		--enable-dbm
131 119
		--enable-o_direct
......
143 131

  
144 132
	# compilation with -O0 fails on amd64, see bug #171231
145 133
	if [[ ${ABI} == amd64 ]]; then
146
		local CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
134
		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
147 135
		replace-flags -O0 -O2
148 136
		is-flagq -O[s123] || append-flags -O2
149 137
	fi
......
162 150
		myconf+=(--disable-tcl )
163 151
	fi
164 152

  
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
165 157
	ECONF_SOURCE="${S_BASE}"/dist \
166 158
	STRIP="true" \
167 159
	econf "${myconf[@]}"
......
212 204
	# db_repsite is used directly in the setup_site_prog,
213 205
	# setup_site_prog is called from open_site_prog
214 206
	# which is called only from tests in the multi_repmgr group.
215
	#sed -ri \
207
	#sed -r \
216 208
	#	-e '/set subs/s,multi_repmgr,,g' \
217
	#	"${S_BASE}/test/testparams.tcl"
209
	#	-i "${S_BASE}/test/testparams.tcl"
218 210
	sed -r \
219 211
		-e '/multi_repmgr/d' \
220 212
		-i "${S_BASE}/test/tcl/test.tcl" || die
Thank you!