From 8ba4321289bcefccb0cf9315c099a8c238ebebe1 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sat, 16 Nov 2019 12:27:14 -0800 Subject: [PATCH] sqlite-replication: do not conflict with sqlite. --- srcpkgs/sqlite-replication-bin | 1 + srcpkgs/sqlite-replication/template | 53 ++++++++++++++++++++++------- 2 files changed, 41 insertions(+), 13 deletions(-) create mode 120000 srcpkgs/sqlite-replication-bin diff --git a/srcpkgs/sqlite-replication-bin b/srcpkgs/sqlite-replication-bin new file mode 120000 index 0000000000..33558ee2d6 --- /dev/null +++ b/srcpkgs/sqlite-replication-bin @@ -0,0 +1 @@ +sqlite-replication \ No newline at end of file diff --git a/srcpkgs/sqlite-replication/template b/srcpkgs/sqlite-replication/template index cfd1c7b8c1..cd53b22c5b 100644 --- a/srcpkgs/sqlite-replication/template +++ b/srcpkgs/sqlite-replication/template @@ -1,21 +1,20 @@ # Template file for 'sqlite-replication' pkgname=sqlite-replication version=3.30.1 -revision=1 -wrksrc="sqlite-version-${version}-replication3" +revision=2 +wrksrc="sqlite-version-${version}-replication4" build_style=gnu-configure -configure_args="--enable-replication --enable-threadsafe --enable-dynamic-extensions --enable-fts5" +configure_args="--enable-replication --enable-threadsafe --enable-fts5 + --enable-dynamic-extensions" hostmakedepends="tcl" makedepends="libedit-devel" short_desc="Replication Enabled SQL Database Engine in a C Library" -maintainer="Cameron Nemo " +maintainer="Cameron Nemo " license="Public Domain" homepage="https://github.com/CanonicalLtd/sqlite" -distfiles="${homepage}/archive/version-${version}+replication3.tar.gz" -checksum=8a21771c49be73d322611fd54ec547d17e6c3bdee6fd234921ef780894e89eed -replaces="sqlite>=3.8.11.1_3" -provides="sqlite-${version}_${revision}" -shlib_provides="libsqlite3.so" +distfiles="${homepage}/archive/version-${version}+replication4.tar.gz" +checksum=e9ab0542396be10e1b2951423f13b3e4d118a18e5d4ef39dc271e7dd17d3910f +shlib_provides="libsqlite3.so.0" CFLAGS+="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \ -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_JSON1 \ @@ -29,15 +28,43 @@ pre_configure() { sed -i -e 's/ -ltinfo//g' configure } +do_configure() { + if [ "$XBPS_TARGET_MACHINE" = "i686" ] ; then + ./configure ${configure_args} \ + --libdir=/usr/lib32/sqlite-replication + else + ./configure ${configure_args} \ + --libdir=/usr/lib/sqlite-replication + fi +} + +post_install() { + if [ "$XBPS_TARGET_MACHINE" = "i686" ] ; then + _libdir="usr/lib32" + else + _libdir="usr/lib" + fi + vmkdir "${_libdir}/pkgconfig" + mv "${DESTDIR}/${_libdir}"{/sqlite-replication,}/pkgconfig/sqlite3.pc + # Alpine just deletes the binary, but someone may want it for debugging + mv "$DESTDIR"/usr/bin/sqlite3{,.sqlite-replication} +} + sqlite-replication-devel_package() { depends="sqlite-replication>=${version}_${revision}" - replaces="sqlite-devel>=0" - provides="sqlite-devel-${version}_${revision}" + conflicts="sqlite-devel>=0" short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove "usr/lib/*.a" - vmove "usr/lib/*.so" + vmove "usr/lib/sqlite-replication/*.a" + vmove "usr/lib/sqlite-replication/*.so" + } +} + +sqlite-replication-bin_package() { + short_desc+=" - cli tool" + pkg_install() { + vmove usr/bin } }