apr-util: set fixed dependency in subpkgs.

This commit is contained in:
Juan RP 2015-02-24 10:50:36 +01:00
parent 876def4928
commit 7bc36b8010
1 changed files with 9 additions and 25 deletions

View File

@ -1,9 +1,7 @@
# Template file for 'apr-util' # Template file for 'apr-util'
pkgname=apr-util pkgname=apr-util
version=1.5.4 version=1.5.4
revision=1 revision=2
# See http://build.voidlinux.eu:8010/builders/armv7l_builder/builds/7623/steps/shell_4/logs/stdio
nocross=1
build_style=gnu-configure build_style=gnu-configure
# XXX: add freetds and unixodbc modules. # XXX: add freetds and unixodbc modules.
configure_args=" configure_args="
@ -21,16 +19,7 @@ license="Apache-2.0"
distfiles="http://www.apache.org/dist/apr/${pkgname}-${version}.tar.bz2" distfiles="http://www.apache.org/dist/apr/${pkgname}-${version}.tar.bz2"
checksum=a6cf327189ca0df2fb9d5633d7326c460fe2b61684745fd7963e79a6dd0dc82e checksum=a6cf327189ca0df2fb9d5633d7326c460fe2b61684745fd7963e79a6dd0dc82e
post_configure() { nocross="http://build.voidlinux.eu/builders/armv7l_builder/builds/7623/steps/shell_4/logs/stdio"
if [ "$CROSS_BUILD" ]; then
sed -i -r \
-e "/^(apr_builddir|apr_builders|top_builddir)=/s:=:=${XBPS_CROSS_BASE}:" \
-e "/^CC=/s:=.*:=$CC:" \
-e '/^(C|CPP|CXX|LD)FLAGS=/d' \
-e '/^LTFLAGS/s:--silent::' \
build/rules.mk
fi
}
post_install() { post_install() {
# remove static libs # remove static libs
@ -47,54 +36,49 @@ apr-util-devel_package() {
vmove usr/lib/pkgconfig vmove usr/lib/pkgconfig
} }
} }
apr-util-db_package() { apr-util-db_package() {
lib32disabled=yes lib32disabled=yes
depends="apr-util>=${version}" depends="apr-util-${version}_${revision}"
short_desc+=" - Berkeley DB module" short_desc+=" - Berkeley DB module"
pkg_install() { pkg_install() {
vmove "usr/lib/apr-util-1/apr_dbm_db*" vmove "usr/lib/apr-util-1/apr_dbm_db*"
} }
} }
apr-util-gdbm_package() { apr-util-gdbm_package() {
depends="apr-util>=${version}" lib32disabled=yes
depends="apr-util-${version}_${revision}"
short_desc+=" - GDBM module" short_desc+=" - GDBM module"
pkg_install() { pkg_install() {
vmove "usr/lib/apr-util-1/apr_dbm_gdbm*" vmove "usr/lib/apr-util-1/apr_dbm_gdbm*"
} }
} }
apr-util-ldap_package() { apr-util-ldap_package() {
lib32disabled=yes lib32disabled=yes
depends="apr-util>=${version}" depends="apr-util-${version}_${revision}"
short_desc+=" - LDAP support" short_desc+=" - LDAP support"
pkg_install() { pkg_install() {
vmove "usr/lib/apr-util-1/apr_ldap*" vmove "usr/lib/apr-util-1/apr_ldap*"
} }
} }
apr-util-mysql_package() { apr-util-mysql_package() {
lib32disabled=yes lib32disabled=yes
depends="apr-util>=${version}" depends="apr-util-${version}_${revision}"
short_desc+=" - MySQL module" short_desc+=" - MySQL module"
pkg_install() { pkg_install() {
vmove "usr/lib/apr-util-1/apr_dbd_mysql*" vmove "usr/lib/apr-util-1/apr_dbd_mysql*"
} }
} }
apr-util-pgsql_package() { apr-util-pgsql_package() {
lib32disabled=yes lib32disabled=yes
depends="apr-util>=${version}" depends="apr-util-${version}_${revision}"
short_desc+=" - PostgreSQL module" short_desc+=" - PostgreSQL module"
pkg_install() { pkg_install() {
vmove "usr/lib/apr-util-1/apr_dbd_pgsql*" vmove "usr/lib/apr-util-1/apr_dbd_pgsql*"
} }
} }
apr-util-sqlite_package() { apr-util-sqlite_package() {
lib32disabled=yes lib32disabled=yes
depends="apr-util>=${version}" depends="apr-util-${version}_${revision}"
short_desc+=" - SQLite module" short_desc+=" - SQLite module"
pkg_install() { pkg_install() {
vmove "usr/lib/apr-util-1/apr_dbd_sqlite*" vmove "usr/lib/apr-util-1/apr_dbd_sqlite*"