diff --git a/srcpkgs/sqlite-tcl b/srcpkgs/sqlite-tcl deleted file mode 120000 index 90a746152e8..00000000000 --- a/srcpkgs/sqlite-tcl +++ /dev/null @@ -1 +0,0 @@ -sqlite \ No newline at end of file diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template index 1b1e5c6b7e8..7f4f65e2f5b 100644 --- a/srcpkgs/sqlite/template +++ b/srcpkgs/sqlite/template @@ -1,10 +1,10 @@ # Template build file for 'sqlite'. pkgname=sqlite version=3.7.17 -revision=1 +revision=2 wrksrc=sqlite create_wrksrc=yes -makedepends="readline-devel tcl-devel" +makedepends="readline-devel" short_desc="SQL Database Engine in a C Library" maintainer="Juan RP " homepage="http://www.sqlite.org" @@ -18,41 +18,22 @@ do_configure() { -DSQLITE_ENABLE_COLUMN_METADATA=1 \ -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE" - if [ "$CROSS_BUILD" ]; then - _tcldir="--with-tcl=$XBPS_CROSS_BASE/lib" - fi - cd ${wrksrc}/sqlite-autoconf-${_amalgamationver} cp -f ${XBPS_CROSSPFDIR}/config.sub . ./configure ${CONFIGURE_SHARED_ARGS} --enable-threadsafe \ --enable-readline --enable-dynamic-extensions - - cd ${wrksrc}/sqlite-autoconf-${_amalgamationver}/tea - cp -f ${XBPS_CROSSPFDIR}/config.sub . - - ./configure ${CONFIGURE_SHARED_ARGS} \ - --with-system-sqlite ${_tcldir} } do_build() { cd ${wrksrc}/sqlite-autoconf-${_amalgamationver} make ${makejobs} - - cd ${wrksrc}/sqlite-autoconf-${_amalgamationver}/tea - if [ -n "$CROSS_BUILD" ]; then - sed -i "s|-L/usr/lib||g;s|-I\"/usr/include\"||g" Makefile - fi - 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 } @@ -65,14 +46,6 @@ sqlite-devel_package() { } } -sqlite-tcl_package() { - depends="sqlite>=$version tcl" - short_desc+=" - TCL bindings" - pkg_install() { - vmove "usr/lib/sqlite*" - } -} - sqlite_package() { pkg_install() { vmove usr