[arch-commits] Commit in lib32-sqlite/repos/multilib-x86_64 (3 files)

Laurent Carlier lcarlier at gemini.archlinux.org
Mon Dec 13 20:11:58 UTC 2021


    Date: Monday, December 13, 2021 @ 20:11:57
  Author: lcarlier
Revision: 1072167

archrelease: copy trunk to multilib-x86_64

Added:
  lib32-sqlite/repos/multilib-x86_64/PKGBUILD
    (from rev 1072166, lib32-sqlite/trunk/PKGBUILD)
  lib32-sqlite/repos/multilib-x86_64/sqlite3-amalgamation_configure.patch
    (from rev 1072166, lib32-sqlite/trunk/sqlite3-amalgamation_configure.patch)
Deleted:
  lib32-sqlite/repos/multilib-x86_64/PKGBUILD

--------------------------------------+
 PKGBUILD                             |  122 +++++++++++++++++----------------
 sqlite3-amalgamation_configure.patch |   37 ++++++++++
 2 files changed, 100 insertions(+), 59 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-13 20:11:53 UTC (rev 1072166)
+++ PKGBUILD	2021-12-13 20:11:57 UTC (rev 1072167)
@@ -1,59 +0,0 @@
-# Maintainer: Biru Ionut <ionut at archlinux.ro>
-# Contributor: Mikko Seppälä <t-r-a-y at mbnet.fi>
-# Contributor: Kaos < gianlucaatlas dot gmail dot com >
-
-_pkgbasename=sqlite
-pkgname=lib32-sqlite
-_srcver=3360000
-pkgver=3.36.0
-pkgrel=1
-pkgdesc="A C library that implements an SQL database engine (32-bit)"
-arch=('x86_64')
-license=('custom')
-url="https://www.sqlite.org/"
-depends=(lib32-glibc $_pkgbasename)
-makedepends=('tcl' 'lib32-readline')
-source=(https://www.sqlite.org/2021/sqlite-src-${_srcver}.zip)
-# upstream now switched to sha3sums - currently not supported by makepkg
-sha256sums=('25a3b9d08066b3a9003f06a96b2a8d1348994c29cc912535401154501d875324')
-
-prepare() {
-  cd "$srcdir"/sqlite-src-$_srcver
-  autoreconf -vfi
-}
-
-build() {
-  cd "$srcdir"/sqlite-src-$_srcver
-
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  export LTLINK_EXTRAS="-ldl"
-  export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 \
-                         -DSQLITE_ENABLE_COLUMN_METADATA=1 \
-                         -DSQLITE_ENABLE_UNLOCK_NOTIFY \
-                         -DSQLITE_ENABLE_DBSTAT_VTAB=1 \
-                         -DSQLITE_ENABLE_FTS3_TOKENIZER=1 \
-                         -DSQLITE_ENABLE_RTREE=1 \
-                         -DSQLITE_SECURE_DELETE \
-                         -DSQLITE_MAX_VARIABLE_NUMBER=250000 \
-                         -DSQLITE_MAX_EXPR_DEPTH=10000"
-
-  ./configure --prefix=/usr \
-    --libdir=/usr/lib32 \
-    --disable-tcl \
-    --disable-static
-
-  make
-}
-
-package() {
-  cd "$srcdir"/sqlite-src-$_srcver
-
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}"/usr/{include,share,bin}
-  mkdir -p "${pkgdir}"/usr/share/licenses
-  ln -s $_pkgbasename "${pkgdir}"/usr/share/licenses/$pkgname
-}

Copied: lib32-sqlite/repos/multilib-x86_64/PKGBUILD (from rev 1072166, lib32-sqlite/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-12-13 20:11:57 UTC (rev 1072167)
@@ -0,0 +1,63 @@
+# Maintainer: Biru Ionut <ionut at archlinux.ro>
+# Contributor: Mikko Seppälä <t-r-a-y at mbnet.fi>
+# Contributor: Kaos < gianlucaatlas dot gmail dot com >
+
+_pkgbasename=sqlite
+pkgname=lib32-sqlite
+_srcver=3370000
+pkgver=3.37.0
+pkgrel=1
+pkgdesc="A C library that implements an SQL database engine (32-bit)"
+arch=('x86_64')
+license=('custom')
+url="https://www.sqlite.org/"
+depends=(lib32-glibc $_pkgbasename)
+makedepends=('tcl' 'lib32-readline')
+source=(https://www.sqlite.org/2021/sqlite-src-${_srcver}.zip
+        sqlite3-amalgamation_configure.patch)
+# upstream now switched to sha3sums - currently not supported by makepkg
+sha256sums=('70977fb3942187d4627413afde9a9492fa02b954850812b53974b6a31ece8faf'
+            '6c5d360d9c6cee104977529cfb5004ca22093824bc5ba9a9741fe567597d3684')
+
+prepare() {
+  cd "$srcdir"/sqlite-src-$_srcver
+
+  patch -Np1 -i ../sqlite3-amalgamation_configure.patch
+  autoreconf -vfi
+}
+
+build() {
+  cd "$srcdir"/sqlite-src-$_srcver
+
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+  export LTLINK_EXTRAS="-ldl"
+  export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 \
+                         -DSQLITE_ENABLE_COLUMN_METADATA=1 \
+                         -DSQLITE_ENABLE_UNLOCK_NOTIFY \
+                         -DSQLITE_ENABLE_DBSTAT_VTAB=1 \
+                         -DSQLITE_ENABLE_FTS3_TOKENIZER=1 \
+                         -DSQLITE_ENABLE_RTREE=1 \
+                         -DSQLITE_SECURE_DELETE \
+                         -DSQLITE_MAX_VARIABLE_NUMBER=250000 \
+                         -DSQLITE_MAX_EXPR_DEPTH=10000"
+
+  ./configure --prefix=/usr \
+    --libdir=/usr/lib32 \
+    --disable-tcl \
+    --disable-static
+
+  make
+}
+
+package() {
+  cd "$srcdir"/sqlite-src-$_srcver
+
+  make DESTDIR="${pkgdir}" install
+
+  rm -rf "${pkgdir}"/usr/{include,share,bin}
+  mkdir -p "${pkgdir}"/usr/share/licenses
+  ln -s $_pkgbasename "${pkgdir}"/usr/share/licenses/$pkgname
+}

Copied: lib32-sqlite/repos/multilib-x86_64/sqlite3-amalgamation_configure.patch (from rev 1072166, lib32-sqlite/trunk/sqlite3-amalgamation_configure.patch)
===================================================================
--- sqlite3-amalgamation_configure.patch	                        (rev 0)
+++ sqlite3-amalgamation_configure.patch	2021-12-13 20:11:57 UTC (rev 1072167)
@@ -0,0 +1,37 @@
+--- sqlite-src-3370000/configure.ac.orig	2021-11-27 16:05:17.000000000 +0100
++++ sqlite-src-3370000/configure.ac	2021-12-03 21:21:47.506868981 +0100
+@@ -116,6 +116,13 @@
+ USE_AMALGAMATION=1
+ 
+ #########
++# By default, amalgamation sqlite3.c will have #line directives.
++# This is a build option not shown by ./configure --help
++# To control it, use configure option: amalgamation_line_macros=?
++# where ? is no to suppress #line directives or yes to create them.
++AMALGAMATION_LINE_MACROS=--linemacros=0
++
++#########
+ # See whether we can run specific tclsh versions known to work well;
+ # if not, then we fall back to plain tclsh.
+ # TODO: try other versions before falling back?
+@@ -574,6 +581,20 @@
+ fi
+ AC_SUBST(USE_AMALGAMATION)
+ 
++########
++# See whether --disable
++if test "${amalgamation_line_macros+set}" = set; then :
++  enableval=$amalgamation_line_macros;
++fi
++
++if test "${amalgamation_line_macros}" = "yes" ; then
++  AMALGAMATION_LINE_MACROS=--linemacros=1
++fi
++if test "${amalgamation_line_macros}" = "no" ; then
++  AMALGAMATION_LINE_MACROS=--linemacros=0
++fi
++AC_SUBST(AMALGAMATION_LINE_MACROS)
++
+ #########
+ # Look for zlib.  Only needed by extensions and by the sqlite3.exe shell
+ AC_CHECK_HEADERS(zlib.h)



More information about the arch-commits mailing list