Patchwork [v2,1/7] sqlite3: Update version 3.7.3 -> 3.7.5

login
register
mail settings
Submitter Khem Raj
Date March 2, 2011, 8:37 a.m.
Message ID <1299055045-8096-2-git-send-email-raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/969/
State Superseded
Headers show

Comments

Khem Raj - March 2, 2011, 8:37 a.m.
* Imported from OE commit a2c3af2d608b1b713018d688b00e03873a538993
* native version of 3.7.3 does not build

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-support/sqlite/sqlite3.inc      |    7 ++++++-
 meta/recipes-support/sqlite/sqlite3_3.7.3.bb |    8 --------
 meta/recipes-support/sqlite/sqlite3_3.7.5.bb |   10 ++++++++++
 3 files changed, 16 insertions(+), 9 deletions(-)
 delete mode 100644 meta/recipes-support/sqlite/sqlite3_3.7.3.bb
 create mode 100644 meta/recipes-support/sqlite/sqlite3_3.7.5.bb
Koen Kooi - March 2, 2011, 8:56 a.m.
Op 2 mrt 2011, om 09:37 heeft Khem Raj het volgende geschreven:

> * Imported from OE commit a2c3af2d608b1b713018d688b00e03873a538993
> * native version of 3.7.3 does not build
> 
> 
> +
> +#do_compile_prepend() {
> +#        oe_runmake sqlite3.h
> +#        install -m 0644 sqlite3.h ${STAGING_INCDIR}
> +#}

Is that hunk needed? Looks OK otherwise
Richard Purdie - March 2, 2011, 9:48 a.m.
On Wed, 2011-03-02 at 00:37 -0800, Khem Raj wrote:
> diff --git a/meta/recipes-support/sqlite/sqlite3.inc b/meta/recipes-support/sqlite/sqlite3.inc
> index 92c4930..a5e6782 100644
> --- a/meta/recipes-support/sqlite/sqlite3.inc
> +++ b/meta/recipes-support/sqlite/sqlite3.inc
> @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.sqlite.org"
>  SECTION = "libs"
>  PRIORITY = "optional"
>  DEPENDS = "readline ncurses tcl-native"
> -DEPENDS_virtclass-native = "tcl-native"
> +DEPENDS_virtclass-native = "tcl-native ncurses-native"
>  LICENSE = "PD"

This missing DEPENDS entry is deliberate since it increases the
bootstrap time for pseudo-native yet sqlite works fine without curses
support.

I assume some kind of failure triggered this update, what was it?

Cheers,

Richard
Mark Hatle - March 2, 2011, 2:28 p.m.
On 3/2/11 2:37 AM, Khem Raj wrote:
> * Imported from OE commit a2c3af2d608b1b713018d688b00e03873a538993
> * native version of 3.7.3 does not build
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  meta/recipes-support/sqlite/sqlite3.inc      |    7 ++++++-
>  meta/recipes-support/sqlite/sqlite3_3.7.3.bb |    8 --------
>  meta/recipes-support/sqlite/sqlite3_3.7.5.bb |   10 ++++++++++
>  3 files changed, 16 insertions(+), 9 deletions(-)
>  delete mode 100644 meta/recipes-support/sqlite/sqlite3_3.7.3.bb
>  create mode 100644 meta/recipes-support/sqlite/sqlite3_3.7.5.bb
> 
> diff --git a/meta/recipes-support/sqlite/sqlite3.inc b/meta/recipes-support/sqlite/sqlite3.inc
> index 92c4930..a5e6782 100644
> --- a/meta/recipes-support/sqlite/sqlite3.inc
> +++ b/meta/recipes-support/sqlite/sqlite3.inc
> @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.sqlite.org"
>  SECTION = "libs"
>  PRIORITY = "optional"
>  DEPENDS = "readline ncurses tcl-native"
> -DEPENDS_virtclass-native = "tcl-native"
> +DEPENDS_virtclass-native = "tcl-native ncurses-native"
>  LICENSE = "PD"

Sorry, I didn't notice this before either.  Is ncurses-native and tcl-native
actually needed here?

From what I understand of sqlite, the ncurses is only used when readline is
used.  Readline during a virtclass-native build is disabled in the sqlite3.inc
file.  (Similarly tcl is also disabled in the sqlite3.inc file.)


>  SRC_URI = "http://www.sqlite.org/sqlite-${PV}.tar.gz \
> @@ -32,3 +32,8 @@ FILES_lib${PN}-doc = "${docdir} ${mandir} ${infodir}"
>  AUTO_LIBNAME_PKGS = "lib${PN}"
>  
>  BBCLASSEXTEND = "native nativesdk"
> +
> +#do_compile_prepend() {
> +#        oe_runmake sqlite3.h
> +#        install -m 0644 sqlite3.h ${STAGING_INCDIR}
> +#}

Any reason to keep this, or can we just remove the code?

> diff --git a/meta/recipes-support/sqlite/sqlite3_3.7.3.bb b/meta/recipes-support/sqlite/sqlite3_3.7.3.bb
> deleted file mode 100644
> index 7296aba..0000000
> --- a/meta/recipes-support/sqlite/sqlite3_3.7.3.bb
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -require sqlite3.inc
> -
> -LIC_FILES_CHKSUM = "file://src/main.c;endline=16;md5=86c9b824e9d68f8a26343a4b57f6d85a"
> -
> -PR = "r1"
> -
> -SRC_URI[md5sum] = "5437978aae90350cf984993091e0d695"
> -SRC_URI[sha256sum] = "dbf352e8fbb74829f5e7a88f9f6ceeb80a709537f668c36e4b6cdfb271309ef6"
> diff --git a/meta/recipes-support/sqlite/sqlite3_3.7.5.bb b/meta/recipes-support/sqlite/sqlite3_3.7.5.bb
> new file mode 100644
> index 0000000..212d9e2
> --- /dev/null
> +++ b/meta/recipes-support/sqlite/sqlite3_3.7.5.bb
> @@ -0,0 +1,10 @@
> +require sqlite3.inc
> +
> +LIC_FILES_CHKSUM = "file://sqlite3.c;endline=19;md5=c1b8048b783961c3ba387c43fd955dc6"
> +
> +SRC_URI = "http://www.sqlite.org/sqlite-autoconf-3070500.tar.gz"
> +S = "${WORKDIR}/sqlite-autoconf-3070500"
> +PR = "r0"
> +
> +SRC_URI[md5sum] = "a9604a82613ade2e7f4c303f233e477f"                                                 
> +SRC_URI[sha256sum] = "cb5b86926ec9f65882b2dddd244f2d620337d911ec73411863f77e48cf6a2f94"
Tom Rini - March 2, 2011, 10:14 p.m.
On 03/02/2011 07:28 AM, Mark Hatle wrote:
> On 3/2/11 2:37 AM, Khem Raj wrote:
>> * Imported from OE commit a2c3af2d608b1b713018d688b00e03873a538993
>> * native version of 3.7.3 does not build
>>
>> Signed-off-by: Khem Raj<raj.khem@gmail.com>
>> ---
>>   meta/recipes-support/sqlite/sqlite3.inc      |    7 ++++++-
>>   meta/recipes-support/sqlite/sqlite3_3.7.3.bb |    8 --------
>>   meta/recipes-support/sqlite/sqlite3_3.7.5.bb |   10 ++++++++++
>>   3 files changed, 16 insertions(+), 9 deletions(-)
>>   delete mode 100644 meta/recipes-support/sqlite/sqlite3_3.7.3.bb
>>   create mode 100644 meta/recipes-support/sqlite/sqlite3_3.7.5.bb
>>
>> diff --git a/meta/recipes-support/sqlite/sqlite3.inc b/meta/recipes-support/sqlite/sqlite3.inc
>> index 92c4930..a5e6782 100644
>> --- a/meta/recipes-support/sqlite/sqlite3.inc
>> +++ b/meta/recipes-support/sqlite/sqlite3.inc
>> @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.sqlite.org"
>>   SECTION = "libs"
>>   PRIORITY = "optional"
>>   DEPENDS = "readline ncurses tcl-native"
>> -DEPENDS_virtclass-native = "tcl-native"
>> +DEPENDS_virtclass-native = "tcl-native ncurses-native"
>>   LICENSE = "PD"
>
> Sorry, I didn't notice this before either.  Is ncurses-native and tcl-native
> actually needed here?

tcl-native is required to build sqlite3 (target or native) as the build 
process itself uses tclsh to generate certain files.  I looked into this 
mid last month as part of a2c3af2d608b1b713018d688b00e03873a538993 in 
oe.dev (where I added readline/ncurses-native as they were in some but 
not all recipes).
Khem Raj - March 3, 2011, 5:29 a.m.
On (02/03/11 08:28), Mark Hatle wrote:
> On 3/2/11 2:37 AM, Khem Raj wrote:
> > * Imported from OE commit a2c3af2d608b1b713018d688b00e03873a538993
> > * native version of 3.7.3 does not build
> > 
> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > ---
> >  meta/recipes-support/sqlite/sqlite3.inc      |    7 ++++++-
> >  meta/recipes-support/sqlite/sqlite3_3.7.3.bb |    8 --------
> >  meta/recipes-support/sqlite/sqlite3_3.7.5.bb |   10 ++++++++++
> >  3 files changed, 16 insertions(+), 9 deletions(-)
> >  delete mode 100644 meta/recipes-support/sqlite/sqlite3_3.7.3.bb
> >  create mode 100644 meta/recipes-support/sqlite/sqlite3_3.7.5.bb
> > 
> > diff --git a/meta/recipes-support/sqlite/sqlite3.inc b/meta/recipes-support/sqlite/sqlite3.inc
> > index 92c4930..a5e6782 100644
> > --- a/meta/recipes-support/sqlite/sqlite3.inc
> > +++ b/meta/recipes-support/sqlite/sqlite3.inc
> > @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.sqlite.org"
> >  SECTION = "libs"
> >  PRIORITY = "optional"
> >  DEPENDS = "readline ncurses tcl-native"
> > -DEPENDS_virtclass-native = "tcl-native"
> > +DEPENDS_virtclass-native = "tcl-native ncurses-native"

this hunk is not needed I have verified so I will remove it.

Patch

diff --git a/meta/recipes-support/sqlite/sqlite3.inc b/meta/recipes-support/sqlite/sqlite3.inc
index 92c4930..a5e6782 100644
--- a/meta/recipes-support/sqlite/sqlite3.inc
+++ b/meta/recipes-support/sqlite/sqlite3.inc
@@ -3,7 +3,7 @@  HOMEPAGE = "http://www.sqlite.org"
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "readline ncurses tcl-native"
-DEPENDS_virtclass-native = "tcl-native"
+DEPENDS_virtclass-native = "tcl-native ncurses-native"
 LICENSE = "PD"
 
 SRC_URI = "http://www.sqlite.org/sqlite-${PV}.tar.gz \
@@ -32,3 +32,8 @@  FILES_lib${PN}-doc = "${docdir} ${mandir} ${infodir}"
 AUTO_LIBNAME_PKGS = "lib${PN}"
 
 BBCLASSEXTEND = "native nativesdk"
+
+#do_compile_prepend() {
+#        oe_runmake sqlite3.h
+#        install -m 0644 sqlite3.h ${STAGING_INCDIR}
+#}
diff --git a/meta/recipes-support/sqlite/sqlite3_3.7.3.bb b/meta/recipes-support/sqlite/sqlite3_3.7.3.bb
deleted file mode 100644
index 7296aba..0000000
--- a/meta/recipes-support/sqlite/sqlite3_3.7.3.bb
+++ /dev/null
@@ -1,8 +0,0 @@ 
-require sqlite3.inc
-
-LIC_FILES_CHKSUM = "file://src/main.c;endline=16;md5=86c9b824e9d68f8a26343a4b57f6d85a"
-
-PR = "r1"
-
-SRC_URI[md5sum] = "5437978aae90350cf984993091e0d695"
-SRC_URI[sha256sum] = "dbf352e8fbb74829f5e7a88f9f6ceeb80a709537f668c36e4b6cdfb271309ef6"
diff --git a/meta/recipes-support/sqlite/sqlite3_3.7.5.bb b/meta/recipes-support/sqlite/sqlite3_3.7.5.bb
new file mode 100644
index 0000000..212d9e2
--- /dev/null
+++ b/meta/recipes-support/sqlite/sqlite3_3.7.5.bb
@@ -0,0 +1,10 @@ 
+require sqlite3.inc
+
+LIC_FILES_CHKSUM = "file://sqlite3.c;endline=19;md5=c1b8048b783961c3ba387c43fd955dc6"
+
+SRC_URI = "http://www.sqlite.org/sqlite-autoconf-3070500.tar.gz"
+S = "${WORKDIR}/sqlite-autoconf-3070500"
+PR = "r0"
+
+SRC_URI[md5sum] = "a9604a82613ade2e7f4c303f233e477f"                                                 
+SRC_URI[sha256sum] = "cb5b86926ec9f65882b2dddd244f2d620337d911ec73411863f77e48cf6a2f94"