diff --git a/srcpkgs/sqlite/sqlite-devel.template b/srcpkgs/sqlite/sqlite-devel.template index 089386ec6f2..04e2cb6a1df 100644 --- a/srcpkgs/sqlite/sqlite-devel.template +++ b/srcpkgs/sqlite/sqlite-devel.template @@ -2,9 +2,9 @@ # depends="tcl-devel readline-devel sqlite>=${version}" short_desc="${short_desc} -- development files" +noarch=yes do_install() { vmove usr/include usr - vmove "usr/lib/*.a" usr/lib vmove usr/lib/pkgconfig usr/lib } diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template index e7f63139637..8c5b56e0c8f 100644 --- a/srcpkgs/sqlite/template +++ b/srcpkgs/sqlite/template @@ -1,11 +1,12 @@ # Template build file for 'sqlite'. pkgname=sqlite version=3.7.15.2 -revision=1 +revision=2 wrksrc=sqlite create_wrksrc=yes subpackages="$pkgname-devel $pkgname-tcl" makedepends="readline-devel tcl-devel" +crossmakedepends="readline-devel tcl-devel" short_desc="SQL Database Engine in a C Library" maintainer="Juan RP " homepage="http://www.sqlite.org" @@ -14,15 +15,26 @@ _amalgamationver=3071502 distfiles="http://www.sqlite.org/sqlite-autoconf-${_amalgamationver}.tar.gz" checksum=782d16b797f6ca879f6f679ba3fb6ceb54bcb0cab65feef332058bf04b36ba8c +if [ -n "$XBPS_CROSS_TRIPLET" ]; then + unset makedepends +fi + do_configure() { export CFLAGS="$XBPS_CFLAGS -DSQLITE_ENABLE_FTS3=1 \ -DSQLITE_ENABLE_COLUMN_METADATA=1 \ -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE" + + if [ -n "$XBPS_CROSS_TRIPLET" ]; then + _tcldir="--with-tcl=/usr/$XBPS_CROSS_TRIPLET/lib" + fi + cd ${wrksrc}/sqlite-autoconf-${_amalgamationver} - ./configure ${CONFIGURE_SHARED_ARGS} + ./configure ${CONFIGURE_SHARED_ARGS} --enable-threadsafe \ + --enable-readline --enable-dynamic-extensions cd ${wrksrc}/sqlite-autoconf-${_amalgamationver}/tea - ./configure ${CONFIGURE_SHARED_ARGS} --with-system-sqlite + ./configure ${CONFIGURE_SHARED_ARGS} \ + --with-system-sqlite ${_tcldir} } do_build() { @@ -30,12 +42,16 @@ do_build() { make ${makejobs} cd ${wrksrc}/sqlite-autoconf-${_amalgamationver}/tea + [ -n "$XBPS_CROSS_TRIPLET" ] && sed -i "s|-L/usr/lib||g" Makefile make ${makejobs} } do_install() { cd ${wrksrc}/sqlite-autoconf-${_amalgamationver} make DESTDIR=${DESTDIR} install + cd ${wrksrc}/sqlite-autoconf-${_amalgamationver}/tea make DESTDIR=${DESTDIR} install + + rm -f ${DESTDIR}/usr/lib/*.a }