diff mbox series

sqlite: Update to version 3310100

Message ID 20200408084936.3616-1-ummeegge@ipfire.org
State Superseded
Headers
Series sqlite: Update to version 3310100 |

Commit Message

ummeegge April 8, 2020, 8:49 a.m. UTC 
  Update includes several fixes and enhancements.
For a full overview https://www.sqlite(.)org/draft/changes.html .

Signed-off-by: Erik Kapfer <ummeegge@ipfire.org>
---
 config/rootfiles/common/sqlite |  2 +-
 lfs/sqlite                     | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

Comments

Michael Tremer April 10, 2020, 2:29 p.m. UTC | #1 
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>

> On 8 Apr 2020, at 09:49, Erik Kapfer <ummeegge@ipfire.org> wrote:
> 
> Update includes several fixes and enhancements.
> For a full overview https://www.sqlite(.)org/draft/changes.html .
> 
> Signed-off-by: Erik Kapfer <ummeegge@ipfire.org>
> ---
> config/rootfiles/common/sqlite |  2 +-
> lfs/sqlite                     | 12 ++++++++----
> 2 files changed, 9 insertions(+), 5 deletions(-)
> 
> diff --git a/config/rootfiles/common/sqlite b/config/rootfiles/common/sqlite
> index f3b0b3697..c3863bdb7 100644
> --- a/config/rootfiles/common/sqlite
> +++ b/config/rootfiles/common/sqlite
> @@ -3,7 +3,7 @@ usr/bin/sqlite3
> #usr/include/sqlite3ext.h
> #usr/lib/libsqlite3.a

You disabled static, but there is still a static library here.

Are you sure?

-Michael

> #usr/lib/libsqlite3.la
> -usr/lib/libsqlite3.so
> +#usr/lib/libsqlite3.so
> usr/lib/libsqlite3.so.0
> usr/lib/libsqlite3.so.0.8.6
> #usr/lib/pkgconfig/sqlite3.pc
> diff --git a/lfs/sqlite b/lfs/sqlite
> index 8f02634cd..000621a0e 100644
> --- a/lfs/sqlite
> +++ b/lfs/sqlite
> @@ -1,7 +1,7 @@
> ###############################################################################
> #                                                                             #
> # IPFire.org - A linux based firewall                                         #
> -# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
> +# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
> #                                                                             #
> # This program is free software: you can redistribute it and/or modify        #
> # it under the terms of the GNU General Public License as published by        #
> @@ -24,7 +24,7 @@
> 
> include Config
> 
> -VER        = 3260000
> +VER        = 3310100
> 
> THISAPP    = sqlite-autoconf-$(VER)
> DL_FILE    = $(THISAPP).tar.gz
> @@ -40,7 +40,7 @@ objects = $(DL_FILE)
> 
> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> 
> -$(DL_FILE)_MD5 = ac2b3b8cd3a97600e36fb8e756e8dda1
> +$(DL_FILE)_MD5 = 2d0a553534c521504e3ac3ad3b90f125
> 
> install : $(TARGET)
> 
> @@ -70,8 +70,12 @@ $(subst %,%_MD5,$(objects)) :
> $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> 	@$(PREBUILD)
> 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
> -	cd $(DIR_APP) && ./configure --prefix=/usr
> +	cd $(DIR_APP) && ./configure	\
> +		--prefix=/usr		\
> +		--enable-static=no	\
> +
> 	cd $(DIR_APP) && make $(MAKETUNING)
> 	cd $(DIR_APP) && make install
> +
> 	@rm -rf $(DIR_APP)
> 	@$(POSTBUILD)
> -- 
> 2.12.2
>
ummeegge April 11, 2020, 7:49 a.m. UTC | #2 
Hi Michael,

Am Freitag, den 10.04.2020, 15:29 +0100 schrieb Michael Tremer:
> Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
> 
> > On 8 Apr 2020, at 09:49, Erik Kapfer <ummeegge@ipfire.org> wrote:
> > 
> > Update includes several fixes and enhancements.
> > For a full overview https://www.sqlite(.)org/draft/changes.html .
> > 
> > Signed-off-by: Erik Kapfer <ummeegge@ipfire.org>
> > ---
> > config/rootfiles/common/sqlite |  2 +-
> > lfs/sqlite                     | 12 ++++++++----
> > 2 files changed, 9 insertions(+), 5 deletions(-)
> > 
> > diff --git a/config/rootfiles/common/sqlite
> > b/config/rootfiles/common/sqlite
> > index f3b0b3697..c3863bdb7 100644
> > --- a/config/rootfiles/common/sqlite
> > +++ b/config/rootfiles/common/sqlite
> > @@ -3,7 +3,7 @@ usr/bin/sqlite3
> > #usr/include/sqlite3ext.h
> > #usr/lib/libsqlite3.a
> 
> You disabled static, but there is still a static library here.
> 
> Are you sure?
the ROOTFILE has been newely generated with the updated LFS, the
configure options does also offer the '--enable-static=no' option.

> 
> -Michael
> 
> > #usr/lib/libsqlite3.la
> > -usr/lib/libsqlite3.so
> > +#usr/lib/libsqlite3.so
> > usr/lib/libsqlite3.so.0
> > usr/lib/libsqlite3.so.0.8.6
> > #usr/lib/pkgconfig/sqlite3.pc
> > diff --git a/lfs/sqlite b/lfs/sqlite
> > index 8f02634cd..000621a0e 100644
> > --- a/lfs/sqlite
> > +++ b/lfs/sqlite
> > @@ -1,7 +1,7 @@
> > ###################################################################
> > ############
> > #                                                                  
> >            #
> > # IPFire.org - A linux based
> > firewall                                         #
> > -# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>         
> >             #
> > +# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>         
> >             #
> > #                                                                  
> >            #
> > # This program is free software: you can redistribute it and/or
> > modify        #
> > # it under the terms of the GNU General Public License as published
> > by        #
> > @@ -24,7 +24,7 @@
> > 
> > include Config
> > 
> > -VER        = 3260000
> > +VER        = 3310100
> > 
> > THISAPP    = sqlite-autoconf-$(VER)
> > DL_FILE    = $(THISAPP).tar.gz
> > @@ -40,7 +40,7 @@ objects = $(DL_FILE)
> > 
> > $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> > 
> > -$(DL_FILE)_MD5 = ac2b3b8cd3a97600e36fb8e756e8dda1
> > +$(DL_FILE)_MD5 = 2d0a553534c521504e3ac3ad3b90f125
> > 
> > install : $(TARGET)
> > 
> > @@ -70,8 +70,12 @@ $(subst %,%_MD5,$(objects)) :
> > $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> > 	@$(PREBUILD)
> > 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf
> > $(DIR_DL)/$(DL_FILE)
> > -	cd $(DIR_APP) && ./configure --prefix=/usr
> > +	cd $(DIR_APP) && ./configure	\
> > +		--prefix=/usr		\
> > +		--enable-static=no	\
> > +
> > 	cd $(DIR_APP) && make $(MAKETUNING)
> > 	cd $(DIR_APP) && make install
> > +
> > 	@rm -rf $(DIR_APP)
> > 	@$(POSTBUILD)
> > -- 
> > 2.12.2
> > 
> 
>
Michael Tremer April 11, 2020, 8:58 a.m. UTC | #3 
Okay, thanks for checking.

It just looked a bit odd, but I am sure it will be fine.

-Michael

> On 11 Apr 2020, at 08:49, ummeegge <ummeegge@ipfire.org> wrote:
> 
> Hi Michael,
> 
> Am Freitag, den 10.04.2020, 15:29 +0100 schrieb Michael Tremer:
>> Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
>> 
>>> On 8 Apr 2020, at 09:49, Erik Kapfer <ummeegge@ipfire.org> wrote:
>>> 
>>> Update includes several fixes and enhancements.
>>> For a full overview https://www.sqlite(.)org/draft/changes.html .
>>> 
>>> Signed-off-by: Erik Kapfer <ummeegge@ipfire.org>
>>> ---
>>> config/rootfiles/common/sqlite |  2 +-
>>> lfs/sqlite                     | 12 ++++++++----
>>> 2 files changed, 9 insertions(+), 5 deletions(-)
>>> 
>>> diff --git a/config/rootfiles/common/sqlite
>>> b/config/rootfiles/common/sqlite
>>> index f3b0b3697..c3863bdb7 100644
>>> --- a/config/rootfiles/common/sqlite
>>> +++ b/config/rootfiles/common/sqlite
>>> @@ -3,7 +3,7 @@ usr/bin/sqlite3
>>> #usr/include/sqlite3ext.h
>>> #usr/lib/libsqlite3.a
>> 
>> You disabled static, but there is still a static library here.
>> 
>> Are you sure?
> the ROOTFILE has been newely generated with the updated LFS, the
> configure options does also offer the '--enable-static=no' option.
> 
>> 
>> -Michael
>> 
>>> #usr/lib/libsqlite3.la
>>> -usr/lib/libsqlite3.so
>>> +#usr/lib/libsqlite3.so
>>> usr/lib/libsqlite3.so.0
>>> usr/lib/libsqlite3.so.0.8.6
>>> #usr/lib/pkgconfig/sqlite3.pc
>>> diff --git a/lfs/sqlite b/lfs/sqlite
>>> index 8f02634cd..000621a0e 100644
>>> --- a/lfs/sqlite
>>> +++ b/lfs/sqlite
>>> @@ -1,7 +1,7 @@
>>> ###################################################################
>>> ############
>>> #                                                                  
>>>           #
>>> # IPFire.org - A linux based
>>> firewall                                         #
>>> -# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>         
>>>            #
>>> +# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>         
>>>            #
>>> #                                                                  
>>>           #
>>> # This program is free software: you can redistribute it and/or
>>> modify        #
>>> # it under the terms of the GNU General Public License as published
>>> by        #
>>> @@ -24,7 +24,7 @@
>>> 
>>> include Config
>>> 
>>> -VER        = 3260000
>>> +VER        = 3310100
>>> 
>>> THISAPP    = sqlite-autoconf-$(VER)
>>> DL_FILE    = $(THISAPP).tar.gz
>>> @@ -40,7 +40,7 @@ objects = $(DL_FILE)
>>> 
>>> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>>> 
>>> -$(DL_FILE)_MD5 = ac2b3b8cd3a97600e36fb8e756e8dda1
>>> +$(DL_FILE)_MD5 = 2d0a553534c521504e3ac3ad3b90f125
>>> 
>>> install : $(TARGET)
>>> 
>>> @@ -70,8 +70,12 @@ $(subst %,%_MD5,$(objects)) :
>>> $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>>> 	@$(PREBUILD)
>>> 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf
>>> $(DIR_DL)/$(DL_FILE)
>>> -	cd $(DIR_APP) && ./configure --prefix=/usr
>>> +	cd $(DIR_APP) && ./configure	\
>>> +		--prefix=/usr		\
>>> +		--enable-static=no	\
>>> +
>>> 	cd $(DIR_APP) && make $(MAKETUNING)
>>> 	cd $(DIR_APP) && make install
>>> +
>>> 	@rm -rf $(DIR_APP)
>>> 	@$(POSTBUILD)
>>> -- 
>>> 2.12.2
diff mbox series

Patch

diff --git a/config/rootfiles/common/sqlite b/config/rootfiles/common/sqlite
index f3b0b3697..c3863bdb7 100644
--- a/config/rootfiles/common/sqlite
+++ b/config/rootfiles/common/sqlite
@@ -3,7 +3,7 @@  usr/bin/sqlite3
 #usr/include/sqlite3ext.h
 #usr/lib/libsqlite3.a
 #usr/lib/libsqlite3.la
-usr/lib/libsqlite3.so
+#usr/lib/libsqlite3.so
 usr/lib/libsqlite3.so.0
 usr/lib/libsqlite3.so.0.8.6
 #usr/lib/pkgconfig/sqlite3.pc
diff --git a/lfs/sqlite b/lfs/sqlite
index 8f02634cd..000621a0e 100644
--- a/lfs/sqlite
+++ b/lfs/sqlite
@@ -1,7 +1,7 @@ 
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@ 
 
 include Config
 
-VER        = 3260000
+VER        = 3310100
 
 THISAPP    = sqlite-autoconf-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@  objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ac2b3b8cd3a97600e36fb8e756e8dda1
+$(DL_FILE)_MD5 = 2d0a553534c521504e3ac3ad3b90f125
 
 install : $(TARGET)
 
@@ -70,8 +70,12 @@  $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr
+	cd $(DIR_APP) && ./configure	\
+		--prefix=/usr		\
+		--enable-static=no	\
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)