pool/sqlite3
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 367770 from home:dimstar:Factory

Browse Source 
The changeset I had in my branch - for @namtrac to decide if he wants any of it

OBS-URL: https://build.opensuse.org/request/show/367770
OBS-URL: https://build.opensuse.org/package/show/server:database/sqlite3?expand=0&rev=150
This commit is contained in:
Ismail Dönmez 2016-03-07 17:37:04 +00:00 committed by Git OBS Bridge
parent 91edd35a74
commit 986bb445a7
4 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sqlite-fts5-link.patch
View File

@ -2,17 +2,11 @@ Index: sqlite-autoconf-3110100/Makefile.am
=================================================================== ===================================================================
--- sqlite-autoconf-3110100.orig/Makefile.am --- sqlite-autoconf-3110100.orig/Makefile.am
+++ sqlite-autoconf-3110100/Makefile.am +++ sqlite-autoconf-3110100/Makefile.am
@@ -3,11 +3,11 @@ AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_ @@ -3,6 +3,7 @@ AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_
lib_LTLIBRARIES = libsqlite3.la lib_LTLIBRARIES = libsqlite3.la
libsqlite3_la_SOURCES = sqlite3.c libsqlite3_la_SOURCES = sqlite3.c
-libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8 +libsqlite3_la_LIBADD = -lm
+libsqlite3_la_LDFLAGS = -lm -no-undefined -version-info 8:6:8 libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8
bin_PROGRAMS = sqlite3 bin_PROGRAMS = sqlite3
sqlite3_SOURCES = shell.c sqlite3.c sqlite3.h
-sqlite3_LDADD = @READLINE_LIBS@
+sqlite3_LDADD = @READLINE_LIBS@ -lm
sqlite3_DEPENDENCIES = @EXTRA_SHELL_OBJ@
sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS

15
sqlite3-link-binary-with-libsqlite3.patch Normal file
View File

@ -0,0 +1,15 @@
Index: sqlite-autoconf-3110100/Makefile.am
===================================================================
--- sqlite-autoconf-3110100.orig/Makefile.am
+++ sqlite-autoconf-3110100/Makefile.am
@@ -7,8 +7,8 @@ libsqlite3_la_LIBADD = -lm
libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8
bin_PROGRAMS = sqlite3
-sqlite3_SOURCES = shell.c sqlite3.c sqlite3.h
-sqlite3_LDADD = @READLINE_LIBS@
+sqlite3_SOURCES = shell.c sqlite3.h
+sqlite3_LDADD = libsqlite3.la @READLINE_LIBS@
sqlite3_DEPENDENCIES = @EXTRA_SHELL_OBJ@
sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS

9
sqlite3.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Mar 7 15:22:53 UTC 2016 - dimstar@opensuse.org
- Fix sqlite-fts5-link.patch: link libsqlite3.so with libm instead
of the sqlite3 binary: the library is the actual user of log().
- Add sqlite3-link-binary-with-libsqlite3.patch: dyamically link
/usr/bin/sqlite3 to libsqlite3 instead of statically using it.
- Move autoreconf call to build section, where it belongs.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Mar 7 13:53:03 UTC 2016 - idonmez@suse.com Mon Mar 7 13:53:03 UTC 2016 - idonmez@suse.com

6
sqlite3.spec
View File

@ -30,6 +30,7 @@ Url: http://www.sqlite.org/
Source0: http://www.sqlite.org/2016/sqlite-autoconf-%{tarversion}.tar.gz Source0: http://www.sqlite.org/2016/sqlite-autoconf-%{tarversion}.tar.gz
Source1: baselibs.conf Source1: baselibs.conf
Source2: http://www.sqlite.org/2016/sqlite-doc-%{tarversion}.zip Source2: http://www.sqlite.org/2016/sqlite-doc-%{tarversion}.zip
Patch0: sqlite3-link-binary-with-libsqlite3.patch
Patch1: sqlite-fts5-link.patch Patch1: sqlite-fts5-link.patch
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
@ -118,12 +119,13 @@ other documentation found on sqlite.org. The files can be found in
%prep %prep
%setup -q -n sqlite-autoconf-%{tarversion} -a2 %setup -q -n sqlite-autoconf-%{tarversion} -a2
autoreconf -fi %patch0 -p1
%patch1 -p1
rm -v sqlite-doc-%{tarversion}/releaselog/current.html rm -v sqlite-doc-%{tarversion}/releaselog/current.html
ln -sv `echo %{version} | sed "s/\./_/g"`.html sqlite-doc-%{tarversion}/releaselog/current.html ln -sv `echo %{version} | sed "s/\./_/g"`.html sqlite-doc-%{tarversion}/releaselog/current.html
%patch1 -p1
%build %build
autoreconf -fi
export CFLAGS="%{optflags} \ export CFLAGS="%{optflags} \
-DSQLITE_ENABLE_COLUMN_METADATA \ -DSQLITE_ENABLE_COLUMN_METADATA \
-DSQLITE_ENABLE_FTS4 \ -DSQLITE_ENABLE_FTS4 \