subversion-kwallet-auth: build separately from subversion, adopt
This commit is contained in:
Piotr Wójcik
Piotr
parent
86d33e784d
commit
e46cd6f4c3
5 changed files with 92 additions and 13 deletions
|
|
@ -1 +0,0 @@
|
|||
subversion
|
||||
1
srcpkgs/subversion-kwallet-auth/patches/cross.patch
Symbolic link
1
srcpkgs/subversion-kwallet-auth/patches/cross.patch
Symbolic link
|
|
@ -0,0 +1 @@
|
|||
../../subversion/patches/cross.patch
|
||||
|
|
@ -0,0 +1 @@
|
|||
../../subversion/patches/subversion-fix-parallel-build-support-for-perl-bindings.patch
|
||||
84
srcpkgs/subversion-kwallet-auth/template
Normal file
84
srcpkgs/subversion-kwallet-auth/template
Normal file
|
|
@ -0,0 +1,84 @@
|
|||
# Template file for 'subversion-kwallet-auth'
|
||||
#
|
||||
# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/subversion".
|
||||
#
|
||||
pkgname=subversion-kwallet-auth
|
||||
version=1.13.0
|
||||
revision=2
|
||||
wrksrc="subversion-${version}"
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-javahl --disable-static --config-cache
|
||||
--with-kwallet=${XBPS_CROSS_BASE}/usr/include:${XBPS_CROSS_BASE}/usr/lib
|
||||
--with-gnome-keyring --with-editor=vi --disable-mod-activation
|
||||
--with-utf8proc=internal"
|
||||
hostmakedepends="automake libtool pkg-config perl python apache-devel gettext"
|
||||
makedepends="apache-devel gdbm-devel libgnome-keyring-devel serf-devel
|
||||
libsecret-devel liblz4-devel python-devel sqlite-devel swig
|
||||
kdelibs4support-devel file-devel perl"
|
||||
short_desc="KDE kwallet authentication support in subversion"
|
||||
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
|
||||
license="Apache-2.0, BSD-3-Clause"
|
||||
homepage="http://subversion.apache.org/"
|
||||
distfiles="http://apache.uvigo.es/subversion/subversion-${version}.tar.bz2"
|
||||
checksum=bc50ce2c3faa7b1ae9103c432017df98dfd989c4239f9f8270bb3a314ed9e5bd
|
||||
lib32disabled=yes
|
||||
|
||||
pre_configure() {
|
||||
# Based on native build values
|
||||
cat <<-EOF >config.cache
|
||||
ac_cv_python_includes=-I${XBPS_CROSS_BASE}/usr/include/python${py2_ver}
|
||||
ac_cv_python_compile="${CC} -fPIC"
|
||||
ac_cv_python_link="${CC} -shared ${LDFLAGS}"
|
||||
ac_cv_python_libs="${LDFLAGS}"
|
||||
EOF
|
||||
if [ "$CROSS_BUILD" ]; then
|
||||
cp -a ${XBPS_CROSS_BASE}/usr/bin/apxs ${wrksrc}
|
||||
cp -a ${XBPS_CROSS_BASE}/usr/share/apache/webroot/build/config_vars.mk ${wrksrc}
|
||||
|
||||
# Use the modified apxs
|
||||
configure_args+=" --with-apxs=${wrksrc}/apxs"
|
||||
|
||||
# Use the ${wrksrc}/config_vars.mk
|
||||
vsed -i apxs \
|
||||
-e "s;[$]installbuilddir/config_vars.mk;${wrksrc}/config_vars.mk;g"
|
||||
|
||||
# Use apr-1-config and apu-1-config wrappers
|
||||
vsed -i config_vars.mk \
|
||||
-e "s;/usr/bin/\(ap.-1-config\);${XBPS_WRAPPERDIR}/\1;g" \
|
||||
-e "s;-I/usr/include;-I${XBPS_CROSS_BASE}/usr/include;g"
|
||||
|
||||
export PERL5LIB=${XBPS_STATEDIR}/perlprefix/${XBPS_TARGET_MACHINE}-linux
|
||||
mkdir -p $PERL5LIB
|
||||
cp "$XBPS_CROSS_BASE/usr/lib/perl5/core_perl/Config"*.p? $PERL5LIB
|
||||
cp "$XBPS_CROSS_BASE/usr/lib/perl5/core_perl/Errno.pm" $PERL5LIB
|
||||
vsed -e "s;archlibexp => '\(.*\)';archlibexp => '${XBPS_CROSS_BASE}\1';" \
|
||||
-i $PERL5LIB/Config.pm $PERL5LIB/Config_heavy.pl
|
||||
else
|
||||
configure_args+=" --with-apxs"
|
||||
fi
|
||||
NOCONFIGURE=1 autoreconf -fi
|
||||
}
|
||||
|
||||
post_configure() {
|
||||
if [ "$CROSS_BUILD" ]; then
|
||||
cd subversion/bindings/swig/perl/native
|
||||
PERL_MM_USE_DEFAULT=1 CC="$CC" LD="$CC" OPTIMIZE="$CFLAGS" \
|
||||
CFLAGS="$CFLAGS -I$XBPS_CROSS_BASE/usr/include" \
|
||||
CCFLAGS="$CFLAGS -I$XBPS_CROSS_BASE/usr/include" \
|
||||
LDFLAGS="$LDFLAGS -L$XBPS_CROSS_BASE/usr/lib -lperl" \
|
||||
LDDLFLAGS="-shared $CFLAGS -L$XBPS_CROSS_BASE/usr/lib" \
|
||||
INSTALLDIRS=vendor \
|
||||
perl Makefile.PL PREFIX=/usr
|
||||
fi
|
||||
}
|
||||
|
||||
do_build() {
|
||||
make ${makejobs} LT_LDFLAGS="-L$Fdestdir/usr/lib"
|
||||
}
|
||||
|
||||
do_install() {
|
||||
export LD_LIBRARY_PATH=${DESTDIR}/usr/lib:$LD_LIBRARY_PATH
|
||||
make DESTDIR=${DESTDIR} INSTALLDIRS=vendor install
|
||||
find ${DESTDIR} '!' -type d '!' -name 'libsvn_auth_kwallet*' -delete
|
||||
vlicense LICENSE
|
||||
}
|
||||
|
|
@ -1,19 +1,21 @@
|
|||
# Template file for 'subversion'
|
||||
#
|
||||
# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/subversion-kwallet-auth".
|
||||
#
|
||||
pkgname=subversion
|
||||
version=1.13.0
|
||||
revision=1
|
||||
revision=2
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-javahl --disable-static --config-cache
|
||||
--with-kwallet=${XBPS_CROSS_BASE}/usr/include:${XBPS_CROSS_BASE}/usr/lib
|
||||
--with-gnome-keyring --with-editor=vi --disable-mod-activation
|
||||
--with-utf8proc=internal"
|
||||
hostmakedepends="automake libtool pkg-config perl python apache-devel gettext"
|
||||
makedepends="apache-devel gdbm-devel libgnome-keyring-devel serf-devel
|
||||
libsecret-devel liblz4-devel python-devel sqlite-devel swig
|
||||
kdelibs4support-devel file-devel perl"
|
||||
file-devel perl"
|
||||
depends="ca-certificates"
|
||||
short_desc="Enterprise-class centralized version control for the masses"
|
||||
maintainer="Orphaned <orphan@voidlinux.org>"
|
||||
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
|
||||
license="Apache-2.0, BSD-3-Clause"
|
||||
homepage="http://subversion.apache.org/"
|
||||
distfiles="http://apache.uvigo.es/subversion/subversion-${version}.tar.bz2"
|
||||
|
|
@ -154,14 +156,6 @@ subversion-gnome-keyring-auth_package() {
|
|||
}
|
||||
}
|
||||
|
||||
subversion-kwallet-auth_package() {
|
||||
lib32disabled=yes
|
||||
short_desc+=" - KDE kwallet authentication support"
|
||||
pkg_install() {
|
||||
vmove "usr/lib/libsvn_auth_kwallet*"
|
||||
}
|
||||
}
|
||||
|
||||
subversion-python_package() {
|
||||
lib32disabled=yes
|
||||
depends="python"
|
||||
|
|
|
|||
Loading…
Reference in a new issue