mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-07 18:07:08 -08:00
dev-libs/apr-util: drop 1.6.1-r10
Signed-off-by: Hans de Graaff <graaff@gentoo.org>
This commit is contained in:
Hans de Graaff
@@ -1,2 +1 @@
|
||||
DIST apr-util-1.6.1.tar.bz2 428595 BLAKE2B ab6eaf1594aaa1c7aae151319b630b83bdb8b68ec04f0e2b429b7c7789bdf274873270200ba43701359e2502d2be8624d8e42a56a5f399ec95a841e7c73ce706 SHA512 40eff8a37c0634f7fdddd6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d
|
||||
DIST apr-util-1.6.3.tar.bz2 432692 BLAKE2B 5eb56c45ba9d87ff3e3769439a3a9a858a1947de68b34892c729f39736fc41117a41c630c3c4cfb07b444c4ee0d5853ec5be158e8fa0b0c0ab89f0cb51cc9c6d SHA512 8050a481eeda7532ef3751dbd8a5aa6c48354d52904a856ef9709484f4b0cc2e022661c49ddf55ec58253db22708ee0607dfa7705d9270e8fee117ae4f06a0fe
|
||||
|
||||
@@ -1,148 +0,0 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
# Usually apr-util has the same PV as apr, but in case of security fixes, this may change.
|
||||
# APR_PV="${PV}"
|
||||
APR_PV="1.7.0-r6"
|
||||
|
||||
inherit autotools db-use libtool multilib toolchain-funcs
|
||||
|
||||
DESCRIPTION="Apache Portable Runtime Utility Library"
|
||||
HOMEPAGE="https://apr.apache.org/"
|
||||
SRC_URI="mirror://apache/apr/${P}.tar.bz2"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="1"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="berkdb doc gdbm ldap mysql nss odbc openssl postgres sqlite static-libs"
|
||||
#RESTRICT="test"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-libs/apr-${APR_PV}:1=
|
||||
dev-libs/expat
|
||||
virtual/libcrypt:=
|
||||
berkdb? ( >=sys-libs/db-4:= )
|
||||
gdbm? ( sys-libs/gdbm:= )
|
||||
ldap? ( net-nds/openldap:= )
|
||||
mysql? ( || (
|
||||
dev-db/mariadb-connector-c
|
||||
>=dev-db/mysql-connector-c-8
|
||||
) )
|
||||
nss? ( dev-libs/nss )
|
||||
odbc? ( dev-db/unixODBC )
|
||||
openssl? (
|
||||
dev-libs/openssl:0=
|
||||
)
|
||||
postgres? ( dev-db/postgresql:= )
|
||||
sqlite? ( dev-db/sqlite:3 )
|
||||
"
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
>=sys-devel/libtool-2.4.2
|
||||
doc? ( app-doc/doxygen )
|
||||
"
|
||||
|
||||
DOCS=(CHANGES NOTICE README)
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-1.5.3-sysroot.patch #385775
|
||||
"${FILESDIR}"/${PN}-1.6.1-fix-gdbm-error-handling.patch
|
||||
"${FILESDIR}"/${PN}-1.6.1-libtool.patch # 779487
|
||||
"${FILESDIR}"/${PN}-1.6.1-mariadb-support.patch
|
||||
"${FILESDIR}"/${PN}-1.6.1-my_bool.patch
|
||||
"${FILESDIR}"/${PN}-1.6.1-drop-my_init.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# Fix usage of libmysqlclient (bug #620230)
|
||||
grep -lrF "libmysqlclient_r" "${S}" \
|
||||
| xargs sed 's@libmysqlclient_r@libmysqlclient@g' -i \
|
||||
|| die
|
||||
|
||||
mv configure.{in,ac} || die
|
||||
eautoreconf
|
||||
elibtoolize
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf=(
|
||||
--datadir="${EPREFIX}"/usr/share/apr-util-1
|
||||
--with-apr="${ESYSROOT}"/usr
|
||||
--with-expat="${EPREFIX}"/usr
|
||||
--without-sqlite2
|
||||
$(use_with gdbm)
|
||||
$(use_with ldap)
|
||||
$(use_with mysql)
|
||||
$(use_with nss)
|
||||
$(use_with odbc)
|
||||
$(use_with openssl)
|
||||
$(use_with postgres pgsql)
|
||||
$(use_with sqlite sqlite3)
|
||||
)
|
||||
|
||||
tc-is-static-only && myconf+=( --disable-util-dso )
|
||||
|
||||
if use berkdb; then
|
||||
local db_version
|
||||
db_version="$(db_findver sys-libs/db)" || die "Unable to find Berkeley DB version"
|
||||
db_version="$(db_ver_to_slot "${db_version}")"
|
||||
db_version="${db_version/\./}"
|
||||
myconf+=(
|
||||
--with-dbm=db${db_version}
|
||||
# We use $T for the libdir because otherwise it'd simply be the normal
|
||||
# system libdir. That's pointless as the compiler will search it for
|
||||
# us already. This makes cross-compiling and such easier.
|
||||
--with-berkeley-db="$(db_includedir 2>/dev/null):${T}"
|
||||
)
|
||||
else
|
||||
myconf+=( --without-berkeley-db )
|
||||
fi
|
||||
|
||||
if use nss || use openssl ; then
|
||||
myconf+=( --with-crypto ) # 518708
|
||||
fi
|
||||
|
||||
econf "${myconf[@]}"
|
||||
# Use the current env build settings rather than whatever apr was built with.
|
||||
sed -i -r \
|
||||
-e "/^(apr_builddir|apr_builders|top_builddir)=/s:=:=${SYSROOT}:" \
|
||||
-e "/^CC=/s:=.*:=$(tc-getCC):" \
|
||||
-e '/^(C|CPP|CXX|LD)FLAGS=/d' \
|
||||
-e '/^LTFLAGS/s:--silent::' \
|
||||
build/rules.mk || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake
|
||||
use doc && emake dox
|
||||
}
|
||||
|
||||
src_test() {
|
||||
# Building tests in parallel is broken
|
||||
emake -j1 check
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
find "${ED}" -name "*.la" -delete || die
|
||||
if [[ -d "${ED}/usr/$(get_libdir)/apr-util-${SLOT}" ]] ; then
|
||||
find "${ED}/usr/$(get_libdir)/apr-util-${SLOT}" -name "*.a" -delete || die
|
||||
fi
|
||||
if ! use static-libs ; then
|
||||
find "${ED}" -name "*.a" -not -name "*$(get_libname)" -delete || die
|
||||
fi
|
||||
|
||||
if use doc ; then
|
||||
docinto html
|
||||
dodoc -r docs/dox/html/*
|
||||
fi
|
||||
|
||||
# This file is only used on AIX systems, which Gentoo is not,
|
||||
# and causes collisions between the SLOTs, so remove it.
|
||||
rm "${ED}/usr/$(get_libdir)/aprutil.exp" || die
|
||||
}
|
||||
Reference in New Issue
Block a user