[arch-commits] Commit in sqlite/trunk (PKGBUILD)

[Andreas Radke]

    Date: Tuesday, August 11, 2015 @ 20:11:43
  Author: andyrtr
Revision: 243173

upgpkg: sqlite 3.8.11.1-2

switch from amalgamation source to full source to allow build additional tools; FS#45947

Modified:
  sqlite/trunk/PKGBUILD

----------+
 PKGBUILD |   69 ++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 35 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-08-11 17:35:30 UTC (rev 243172)
+++ PKGBUILD	2015-08-11 18:11:43 UTC (rev 243173)
@@ -4,25 +4,29 @@
 
 pkgbase="sqlite"
 pkgname=('sqlite' 'sqlite-tcl' 'sqlite-doc') 
-_amalgamationver=3081101
-_docver=${_amalgamationver}
+_srcver=3081101
+_docver=${_srcver}
 #_docver=3080001
 pkgver=3.8.11.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A C library that implements an SQL database engine"
 arch=('i686' 'x86_64')
 license=('custom:Public Domain')
 url="http://www.sqlite.org/"
 makedepends=('tcl' 'readline')
-source=( # tarball containing the amalgamation for SQLite >= 3.7.5 together with a configure script and makefile for building it; includes now also the Tcl Extension Architecture (TEA)
-	http://www.sqlite.org/2015/sqlite-autoconf-$_amalgamationver.tar.gz
-	http://www.sqlite.org/2015/sqlite-doc-${_docver}.zip
-	license.txt)
+source=(http://www.sqlite.org/2015/sqlite-src-${_srcver}.zip
+        http://www.sqlite.org/2015/sqlite-doc-${_docver}.zip
+        license.txt)
 options=('!emptydirs' '!makeflags')
-sha1sums=('d0e22d7e361b6f50830a3cdeafe35311443f8f9a'
+sha1sums=('120257f723649f7c84db8003972d599cb8d301a4'
           '9ea6ec64c4959e8099ebe76a24b32784ee00e19d'
           'f34f6daa4ab3073d74e774aad21d66878cf26853')
 
+prepare() {
+  cd "$srcdir"/sqlite-src-$_srcver
+  autoreconf -vfi
+}
+
 build() {
   export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 \
                          -DSQLITE_ENABLE_COLUMN_METADATA=1 \
@@ -31,18 +35,13 @@
                          -DSQLITE_SECURE_DELETE"
 
   # build sqlite
-  cd "$srcdir"/sqlite-autoconf-$_amalgamationver
-
+  cd "$srcdir"/sqlite-src-$_srcver
   ./configure --prefix=/usr \
-	--disable-static
+	--disable-static \
+	TCLLIBDIR=/usr/lib/sqlite$pkgver
   make
-  
-  # build the tcl extension    
-  cd "$srcdir"/sqlite-autoconf-$_amalgamationver/tea
-  ./configure --prefix=/usr \
-	--with-system-sqlite
-  make
-
+  # build additional tools
+  make showdb showjournal showstat4 showwal sqldiff
 }
 
 package_sqlite() {
@@ -52,11 +51,21 @@
  provides=("sqlite3=$pkgver")
  replaces=("sqlite3")
  
-  cd ${srcdir}/sqlite-autoconf-$_amalgamationver
+  cd ${srcdir}/sqlite-src-$_srcver
   make DESTDIR=${pkgdir} install
   
+  install -m755 showdb showjournal showstat4 showwal sqldiff ${pkgdir}/usr/bin/
+  
+  # install manpage
+  install -m755 -d ${pkgdir}/usr/share/man/man1
+  install -m644 sqlite3.1 ${pkgdir}/usr/share/man/man1/
+  
   # license - no linking required because pkgbase=pkgname
   install -D -m644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/${pkgbase}/license.txt
+  
+  # split out tcl extension
+  mkdir $srcdir/tcl
+  mv $pkgdir/usr/lib/sqlite* $srcdir/tcl
 }
 
 package_sqlite-tcl() {
@@ -65,10 +74,14 @@
  depends=('sqlite')
  provides=("sqlite3-tcl=$pkgver")
  replaces=("sqlite3-tcl")
- 
-  cd ${srcdir}/sqlite-autoconf-$_amalgamationver/tea
-  make DESTDIR=${pkgdir} install
+
+  install -m755 -d ${pkgdir}/usr/lib
+  mv $srcdir/tcl/* ${pkgdir}/usr/lib
   
+  # install manpage
+  install -m755 -d ${pkgdir}/usr/share/man/mann
+  install -m644 ${srcdir}/sqlite-src-$_srcver/autoconf/tea/doc/sqlite3.n ${pkgdir}/usr/share/man/mann/
+  
   # link license
   install -m755 -d ${pkgdir}/usr/share/licenses
   ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
@@ -85,16 +98,4 @@
   cd ${srcdir}/sqlite-doc-${_docver}
   mkdir -p ${pkgdir}/usr/share/doc/${pkgbase}
   cp -R *  ${pkgdir}/usr/share/doc/${pkgbase}/
-  
-  # fix permissions and remove obsolete files; https://bugs.archlinux.org/task/24605
-  find ${pkgdir} -type f -perm 755 -exec ls -lha {} \;
-  find ${pkgdir} -type f -perm 755 -exec chmod 644 {} \;
-
-  find ${pkgdir} -type f -name '*~' -exec ls -lha {} \;
-  find ${pkgdir} -type d -name '*~' -exec ls -lha {} \;
-  find ${pkgdir} -name '*~' -exec rm -f {} \;
-
-  find ${pkgdir} -type f -name '.~*' -exec ls -lha {} \; # /build/pkg/sqlite-doc/usr/share/doc/sqlite/images/fileformat/.~lock.indexpage.odg#
-  find ${pkgdir} -type d -name '.~*' -exec ls -lha {} \;
-  find ${pkgdir} -name '.~*' -exec rm -f {} \;
 }