* [PATCH v2] sqlite3: upgrade to version 3.10.0
@ 2016-01-13 10:46 Maxin B. John
2016-01-22 7:08 ` Andre McCurdy
0 siblings, 1 reply; 5+ messages in thread
From: Maxin B. John @ 2016-01-13 10:46 UTC (permalink / raw)
To: openembedded-core
3.9.2 -> 3.10.0
1. Fixed a parallel build problem
2. Added a PACKAGECONFIG for readline
Signed-off-by: Maxin B. John <maxin.john@intel.com>
---
meta/recipes-support/sqlite/sqlite3.inc | 2 ++
meta/recipes-support/sqlite/sqlite3/parallel.patch | 24 ++++++++++++++++++++++
.../sqlite/{sqlite3_3.9.2.bb => sqlite3_3.10.0.bb} | 8 +++++---
3 files changed, 31 insertions(+), 3 deletions(-)
create mode 100644 meta/recipes-support/sqlite/sqlite3/parallel.patch
rename meta/recipes-support/sqlite/{sqlite3_3.9.2.bb => sqlite3_3.10.0.bb} (71%)
diff --git a/meta/recipes-support/sqlite/sqlite3.inc b/meta/recipes-support/sqlite/sqlite3.inc
index 2e3791b..5eb5de3 100644
--- a/meta/recipes-support/sqlite/sqlite3.inc
+++ b/meta/recipes-support/sqlite/sqlite3.inc
@@ -9,6 +9,8 @@ inherit autotools pkgconfig
EXTRA_OECONF = "--enable-shared --enable-threadsafe"
EXTRA_OECONF_class-native = "--enable-shared --enable-threadsafe --disable-readline"
+PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline"
+
export config_BUILD_CC = "${BUILD_CC}"
export config_BUILD_CFLAGS = "${BUILD_CFLAGS}"
export config_BUILD_LIBS = "${BUILD_LDFLAGS}"
diff --git a/meta/recipes-support/sqlite/sqlite3/parallel.patch b/meta/recipes-support/sqlite/sqlite3/parallel.patch
new file mode 100644
index 0000000..87471f0
--- /dev/null
+++ b/meta/recipes-support/sqlite/sqlite3/parallel.patch
@@ -0,0 +1,24 @@
+build: Fix parallel build problems
+
+Avoid parallel build errors related to sqlite3.o target.
+
+Upstream-Status: Pending
+
+Signed-off-by: Maxin B. John <maxin.john@intel.com>
+---
+diff -Naur sqlite-autoconf-3100000-orig/Makefile.am sqlite-autoconf-3100000/Makefile.am
+--- sqlite-autoconf-3100000-orig/Makefile.am 2016-01-06 14:03:00.000000000 +0200
++++ sqlite-autoconf-3100000/Makefile.am 2016-01-12 13:14:03.620117514 +0200
+@@ -6,10 +6,8 @@
+ libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8
+
+ bin_PROGRAMS = sqlite3
+-sqlite3_SOURCES = shell.c sqlite3.h
+-EXTRA_sqlite3_SOURCES = sqlite3.c
+-sqlite3_LDADD = @EXTRA_SHELL_OBJ@ @READLINE_LIBS@
+-sqlite3_DEPENDENCIES = @EXTRA_SHELL_OBJ@
++sqlite3_SOURCES = shell.c sqlite3.c sqlite3.h
++sqlite3_LDADD = @READLINE_LIBS@
+ sqlite3_CFLAGS = $(AM_CFLAGS)
+
+ include_HEADERS = sqlite3.h sqlite3ext.h
diff --git a/meta/recipes-support/sqlite/sqlite3_3.9.2.bb b/meta/recipes-support/sqlite/sqlite3_3.10.0.bb
similarity index 71%
rename from meta/recipes-support/sqlite/sqlite3_3.9.2.bb
rename to meta/recipes-support/sqlite/sqlite3_3.10.0.bb
index 18b1a2b..092f782 100644
--- a/meta/recipes-support/sqlite/sqlite3_3.9.2.bb
+++ b/meta/recipes-support/sqlite/sqlite3_3.10.0.bb
@@ -10,10 +10,12 @@ def sqlite_download_version(d):
PE = "3"
SQLITE_PV = "${@sqlite_download_version(d)}"
-SRC_URI = "http://www.sqlite.org/2015/sqlite-autoconf-${SQLITE_PV}.tar.gz"
+SRC_URI = "http://www.sqlite.org/2016/sqlite-autoconf-${SQLITE_PV}.tar.gz \
+ file://parallel.patch \
+ "
-SRC_URI[md5sum] = "bc4eb5b3fc5cfcb6e059794306cac1ca"
-SRC_URI[sha256sum] = "064c0abe9c9177534d4c770bca7a5902f9924b629ac886b4c08956be6dfbc36b"
+SRC_URI[md5sum] = "274364e6ca5c1104d42912f11e61ed26"
+SRC_URI[sha256sum] = "43cc292d70711fa7580250c8a1cd7c64813a4a0a479dbd502cce5f10b5d91042"
UPSTREAM_CHECK_URI = "http://www.sqlite.org/"
UPSTREAM_CHECK_REGEX = "releaselog/(?P<pver>(\d+[\.\-_]*)+)\.html"
--
2.4.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v2] sqlite3: upgrade to version 3.10.0 2016-01-13 10:46 [PATCH v2] sqlite3: upgrade to version 3.10.0 Maxin B. John @ 2016-01-22 7:08 ` Andre McCurdy 2016-01-22 19:02 ` Andre McCurdy 2016-01-22 19:05 ` Mark Hatle 0 siblings, 2 replies; 5+ messages in thread From: Andre McCurdy @ 2016-01-22 7:08 UTC (permalink / raw) To: Maxin B. John; +Cc: OE Core mailing list On Wed, Jan 13, 2016 at 2:46 AM, Maxin B. John <maxin.john@intel.com> wrote: > 3.9.2 -> 3.10.0 > > 1. Fixed a parallel build problem > 2. Added a PACKAGECONFIG for readline > > Signed-off-by: Maxin B. John <maxin.john@intel.com> > --- > meta/recipes-support/sqlite/sqlite3.inc | 2 ++ > meta/recipes-support/sqlite/sqlite3/parallel.patch | 24 ++++++++++++++++++++++ > .../sqlite/{sqlite3_3.9.2.bb => sqlite3_3.10.0.bb} | 8 +++++--- > 3 files changed, 31 insertions(+), 3 deletions(-) > create mode 100644 meta/recipes-support/sqlite/sqlite3/parallel.patch > rename meta/recipes-support/sqlite/{sqlite3_3.9.2.bb => sqlite3_3.10.0.bb} (71%) > > diff --git a/meta/recipes-support/sqlite/sqlite3.inc b/meta/recipes-support/sqlite/sqlite3.inc > index 2e3791b..5eb5de3 100644 > --- a/meta/recipes-support/sqlite/sqlite3.inc > +++ b/meta/recipes-support/sqlite/sqlite3.inc > @@ -9,6 +9,8 @@ inherit autotools pkgconfig > > EXTRA_OECONF = "--enable-shared --enable-threadsafe" > EXTRA_OECONF_class-native = "--enable-shared --enable-threadsafe --disable-readline" > +PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline" Adding this without also adding PACKAGECONFIG ?= "readline" or similar means target sqlite3 will now build with readline support disabled. Was that the intention? > export config_BUILD_CC = "${BUILD_CC}" > export config_BUILD_CFLAGS = "${BUILD_CFLAGS}" > export config_BUILD_LIBS = "${BUILD_LDFLAGS}" > diff --git a/meta/recipes-support/sqlite/sqlite3/parallel.patch b/meta/recipes-support/sqlite/sqlite3/parallel.patch > new file mode 100644 > index 0000000..87471f0 > --- /dev/null > +++ b/meta/recipes-support/sqlite/sqlite3/parallel.patch > @@ -0,0 +1,24 @@ > +build: Fix parallel build problems > + > +Avoid parallel build errors related to sqlite3.o target. > + > +Upstream-Status: Pending > + > +Signed-off-by: Maxin B. John <maxin.john@intel.com> > +--- > +diff -Naur sqlite-autoconf-3100000-orig/Makefile.am sqlite-autoconf-3100000/Makefile.am > +--- sqlite-autoconf-3100000-orig/Makefile.am 2016-01-06 14:03:00.000000000 +0200 > ++++ sqlite-autoconf-3100000/Makefile.am 2016-01-12 13:14:03.620117514 +0200 > +@@ -6,10 +6,8 @@ > + libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8 > + > + bin_PROGRAMS = sqlite3 > +-sqlite3_SOURCES = shell.c sqlite3.h > +-EXTRA_sqlite3_SOURCES = sqlite3.c > +-sqlite3_LDADD = @EXTRA_SHELL_OBJ@ @READLINE_LIBS@ > +-sqlite3_DEPENDENCIES = @EXTRA_SHELL_OBJ@ > ++sqlite3_SOURCES = shell.c sqlite3.c sqlite3.h > ++sqlite3_LDADD = @READLINE_LIBS@ > + sqlite3_CFLAGS = $(AM_CFLAGS) > + > + include_HEADERS = sqlite3.h sqlite3ext.h > diff --git a/meta/recipes-support/sqlite/sqlite3_3.9.2.bb b/meta/recipes-support/sqlite/sqlite3_3.10.0.bb > similarity index 71% > rename from meta/recipes-support/sqlite/sqlite3_3.9.2.bb > rename to meta/recipes-support/sqlite/sqlite3_3.10.0.bb > index 18b1a2b..092f782 100644 > --- a/meta/recipes-support/sqlite/sqlite3_3.9.2.bb > +++ b/meta/recipes-support/sqlite/sqlite3_3.10.0.bb > @@ -10,10 +10,12 @@ def sqlite_download_version(d): > > PE = "3" > SQLITE_PV = "${@sqlite_download_version(d)}" > -SRC_URI = "http://www.sqlite.org/2015/sqlite-autoconf-${SQLITE_PV}.tar.gz" > +SRC_URI = "http://www.sqlite.org/2016/sqlite-autoconf-${SQLITE_PV}.tar.gz \ > + file://parallel.patch \ > + " > > -SRC_URI[md5sum] = "bc4eb5b3fc5cfcb6e059794306cac1ca" > -SRC_URI[sha256sum] = "064c0abe9c9177534d4c770bca7a5902f9924b629ac886b4c08956be6dfbc36b" > +SRC_URI[md5sum] = "274364e6ca5c1104d42912f11e61ed26" > +SRC_URI[sha256sum] = "43cc292d70711fa7580250c8a1cd7c64813a4a0a479dbd502cce5f10b5d91042" > > UPSTREAM_CHECK_URI = "http://www.sqlite.org/" > UPSTREAM_CHECK_REGEX = "releaselog/(?P<pver>(\d+[\.\-_]*)+)\.html" > -- > 2.4.0 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] sqlite3: upgrade to version 3.10.0 2016-01-22 7:08 ` Andre McCurdy @ 2016-01-22 19:02 ` Andre McCurdy 2016-01-25 9:43 ` Maxin B. John 2016-01-22 19:05 ` Mark Hatle 1 sibling, 1 reply; 5+ messages in thread From: Andre McCurdy @ 2016-01-22 19:02 UTC (permalink / raw) To: Maxin B. John; +Cc: OE Core mailing list On Thu, Jan 21, 2016 at 11:08 PM, Andre McCurdy <armccurdy@gmail.com> wrote: > On Wed, Jan 13, 2016 at 2:46 AM, Maxin B. John <maxin.john@intel.com> wrote: >> 3.9.2 -> 3.10.0 >> >> 1. Fixed a parallel build problem >> 2. Added a PACKAGECONFIG for readline >> >> Signed-off-by: Maxin B. John <maxin.john@intel.com> >> --- >> meta/recipes-support/sqlite/sqlite3.inc | 2 ++ >> meta/recipes-support/sqlite/sqlite3/parallel.patch | 24 ++++++++++++++++++++++ >> .../sqlite/{sqlite3_3.9.2.bb => sqlite3_3.10.0.bb} | 8 +++++--- >> 3 files changed, 31 insertions(+), 3 deletions(-) >> create mode 100644 meta/recipes-support/sqlite/sqlite3/parallel.patch >> rename meta/recipes-support/sqlite/{sqlite3_3.9.2.bb => sqlite3_3.10.0.bb} (71%) >> >> diff --git a/meta/recipes-support/sqlite/sqlite3.inc b/meta/recipes-support/sqlite/sqlite3.inc >> index 2e3791b..5eb5de3 100644 >> --- a/meta/recipes-support/sqlite/sqlite3.inc >> +++ b/meta/recipes-support/sqlite/sqlite3.inc >> @@ -9,6 +9,8 @@ inherit autotools pkgconfig >> >> EXTRA_OECONF = "--enable-shared --enable-threadsafe" >> EXTRA_OECONF_class-native = "--enable-shared --enable-threadsafe --disable-readline" >> +PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline" > > Adding this without also adding PACKAGECONFIG ?= "readline" or similar > means target sqlite3 will now build with readline support disabled. > > Was that the intention? > >> export config_BUILD_CC = "${BUILD_CC}" >> export config_BUILD_CFLAGS = "${BUILD_CFLAGS}" >> export config_BUILD_LIBS = "${BUILD_LDFLAGS}" >> diff --git a/meta/recipes-support/sqlite/sqlite3/parallel.patch b/meta/recipes-support/sqlite/sqlite3/parallel.patch >> new file mode 100644 >> index 0000000..87471f0 >> --- /dev/null >> +++ b/meta/recipes-support/sqlite/sqlite3/parallel.patch >> @@ -0,0 +1,24 @@ >> +build: Fix parallel build problems >> + >> +Avoid parallel build errors related to sqlite3.o target. >> + >> +Upstream-Status: Pending >> + >> +Signed-off-by: Maxin B. John <maxin.john@intel.com> >> +--- >> +diff -Naur sqlite-autoconf-3100000-orig/Makefile.am sqlite-autoconf-3100000/Makefile.am >> +--- sqlite-autoconf-3100000-orig/Makefile.am 2016-01-06 14:03:00.000000000 +0200 >> ++++ sqlite-autoconf-3100000/Makefile.am 2016-01-12 13:14:03.620117514 +0200 >> +@@ -6,10 +6,8 @@ >> + libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8 >> + >> + bin_PROGRAMS = sqlite3 >> +-sqlite3_SOURCES = shell.c sqlite3.h >> +-EXTRA_sqlite3_SOURCES = sqlite3.c >> +-sqlite3_LDADD = @EXTRA_SHELL_OBJ@ @READLINE_LIBS@ >> +-sqlite3_DEPENDENCIES = @EXTRA_SHELL_OBJ@ >> ++sqlite3_SOURCES = shell.c sqlite3.c sqlite3.h >> ++sqlite3_LDADD = @READLINE_LIBS@ >> + sqlite3_CFLAGS = $(AM_CFLAGS) This change is wrong. If you unconditionally add sqlite3.c to sqlite3_SOURCES you break the option of dynamically linking sqlite3 with libsqlite3.so (ie the configure option --disable-static-shell). (For building in OE we should probably be configuring with --disable-static-shell by default). What was the original parallel build issue you were seeing? >> + include_HEADERS = sqlite3.h sqlite3ext.h >> diff --git a/meta/recipes-support/sqlite/sqlite3_3.9.2.bb b/meta/recipes-support/sqlite/sqlite3_3.10.0.bb >> similarity index 71% >> rename from meta/recipes-support/sqlite/sqlite3_3.9.2.bb >> rename to meta/recipes-support/sqlite/sqlite3_3.10.0.bb >> index 18b1a2b..092f782 100644 >> --- a/meta/recipes-support/sqlite/sqlite3_3.9.2.bb >> +++ b/meta/recipes-support/sqlite/sqlite3_3.10.0.bb >> @@ -10,10 +10,12 @@ def sqlite_download_version(d): >> >> PE = "3" >> SQLITE_PV = "${@sqlite_download_version(d)}" >> -SRC_URI = "http://www.sqlite.org/2015/sqlite-autoconf-${SQLITE_PV}.tar.gz" >> +SRC_URI = "http://www.sqlite.org/2016/sqlite-autoconf-${SQLITE_PV}.tar.gz \ >> + file://parallel.patch \ >> + " >> >> -SRC_URI[md5sum] = "bc4eb5b3fc5cfcb6e059794306cac1ca" >> -SRC_URI[sha256sum] = "064c0abe9c9177534d4c770bca7a5902f9924b629ac886b4c08956be6dfbc36b" >> +SRC_URI[md5sum] = "274364e6ca5c1104d42912f11e61ed26" >> +SRC_URI[sha256sum] = "43cc292d70711fa7580250c8a1cd7c64813a4a0a479dbd502cce5f10b5d91042" >> >> UPSTREAM_CHECK_URI = "http://www.sqlite.org/" >> UPSTREAM_CHECK_REGEX = "releaselog/(?P<pver>(\d+[\.\-_]*)+)\.html" >> -- >> 2.4.0 >> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core@lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] sqlite3: upgrade to version 3.10.0 2016-01-22 19:02 ` Andre McCurdy @ 2016-01-25 9:43 ` Maxin B. John 0 siblings, 0 replies; 5+ messages in thread From: Maxin B. John @ 2016-01-25 9:43 UTC (permalink / raw) To: Andre McCurdy; +Cc: OE Core mailing list Hi, On Fri, Jan 22, 2016 at 11:02:59AM -0800, Andre McCurdy wrote: > On Thu, Jan 21, 2016 at 11:08 PM, Andre McCurdy <armccurdy@gmail.com> wrote: > > On Wed, Jan 13, 2016 at 2:46 AM, Maxin B. John <maxin.john@intel.com> wrote: > >> 3.9.2 -> 3.10.0 > >> > >> 1. Fixed a parallel build problem > >> 2. Added a PACKAGECONFIG for readline > >> > >> Signed-off-by: Maxin B. John <maxin.john@intel.com> > >> --- > >> meta/recipes-support/sqlite/sqlite3.inc | 2 ++ > >> meta/recipes-support/sqlite/sqlite3/parallel.patch | 24 ++++++++++++++++++++++ > >> .../sqlite/{sqlite3_3.9.2.bb => sqlite3_3.10.0.bb} | 8 +++++--- > >> 3 files changed, 31 insertions(+), 3 deletions(-) > >> create mode 100644 meta/recipes-support/sqlite/sqlite3/parallel.patch > >> rename meta/recipes-support/sqlite/{sqlite3_3.9.2.bb => sqlite3_3.10.0.bb} (71%) > >> > >> diff --git a/meta/recipes-support/sqlite/sqlite3.inc b/meta/recipes-support/sqlite/sqlite3.inc > >> index 2e3791b..5eb5de3 100644 > >> --- a/meta/recipes-support/sqlite/sqlite3.inc > >> +++ b/meta/recipes-support/sqlite/sqlite3.inc > >> @@ -9,6 +9,8 @@ inherit autotools pkgconfig > >> > >> EXTRA_OECONF = "--enable-shared --enable-threadsafe" > >> EXTRA_OECONF_class-native = "--enable-shared --enable-threadsafe --disable-readline" > >> +PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline" > > > > Adding this without also adding PACKAGECONFIG ?= "readline" or similar > > means target sqlite3 will now build with readline support disabled. > > > > Was that the intention? I think it was a mistake from my side. Sorry about that. > >> export config_BUILD_CC = "${BUILD_CC}" > >> export config_BUILD_CFLAGS = "${BUILD_CFLAGS}" > >> export config_BUILD_LIBS = "${BUILD_LDFLAGS}" > >> diff --git a/meta/recipes-support/sqlite/sqlite3/parallel.patch b/meta/recipes-support/sqlite/sqlite3/parallel.patch > >> new file mode 100644 > >> index 0000000..87471f0 > >> --- /dev/null > >> +++ b/meta/recipes-support/sqlite/sqlite3/parallel.patch > >> @@ -0,0 +1,24 @@ > >> +build: Fix parallel build problems > >> + > >> +Avoid parallel build errors related to sqlite3.o target. > >> + > >> +Upstream-Status: Pending > >> + > >> +Signed-off-by: Maxin B. John <maxin.john@intel.com> > >> +--- > >> +diff -Naur sqlite-autoconf-3100000-orig/Makefile.am sqlite-autoconf-3100000/Makefile.am > >> +--- sqlite-autoconf-3100000-orig/Makefile.am 2016-01-06 14:03:00.000000000 +0200 > >> ++++ sqlite-autoconf-3100000/Makefile.am 2016-01-12 13:14:03.620117514 +0200 > >> +@@ -6,10 +6,8 @@ > >> + libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8 > >> + > >> + bin_PROGRAMS = sqlite3 > >> +-sqlite3_SOURCES = shell.c sqlite3.h > >> +-EXTRA_sqlite3_SOURCES = sqlite3.c > >> +-sqlite3_LDADD = @EXTRA_SHELL_OBJ@ @READLINE_LIBS@ > >> +-sqlite3_DEPENDENCIES = @EXTRA_SHELL_OBJ@ > >> ++sqlite3_SOURCES = shell.c sqlite3.c sqlite3.h > >> ++sqlite3_LDADD = @READLINE_LIBS@ > >> + sqlite3_CFLAGS = $(AM_CFLAGS) > > This change is wrong. If you unconditionally add sqlite3.c to > sqlite3_SOURCES you break the option of dynamically linking sqlite3 > with libsqlite3.so (ie the configure option --disable-static-shell). > > (For building in OE we should probably be configuring with > --disable-static-shell by default). > > What was the original parallel build issue you were seeing? > Here is the error message without this patch: ERROR: oe_runmake failed ERROR: Function failed: do_compile (log file is located at /home/maxin/poky/build/tmp/work/x86_64-linux/sqlite3-native/3_3.10.0-r0/temp/log.do_compile.31853) ERROR: Logfile of failure stored in: /home/maxin/poky/build/tmp/work/x86_64-linux/sqlite3-native/3_3.10.0-r0/temp/log.do_compile.31853 Log data follows: | DEBUG: Executing shell function do_compile | NOTE: make -j 16 | ./x86_64-linux-libtool --tag=CC --mode=compile gcc -DPACKAGE_NAME=\"sqlite\" -DPACKAGE_TARNAME=\"sqlite\" -DPACKAGE_VERSION=\"3.10.0\" -DPACKAGE_STRING=\"sqlite\ 3.10.0\" -DPACKAGE_BUGREPORT=\"http://www.sqlite.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"sqlite\" -DVERSION=\"3.10.0\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DHAVE_FDATASYNC=1 -DHAVE_USLEEP=1 -DHAVE_LOCALTIME_R=1 -DHAVE_GMTIME_R=1 -DHAVE_DECL_STRERROR_R=1 -DHAVE_STRERROR_R=1 -DHAVE_POSIX_FALLOCATE=1 -I. -I../sqlite-autoconf-3100000 -isystem/home/maxin/poky/build/tmp/sysroots/x86_64-linux/usr/include -D_REENTRANT=1 -DSQLITE_THREADSAFE=1 -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE -isystem/home/maxin/poky/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe -DUSE_PREAD -DSQLITE_ENABLE_COLUMN_METADATA -c -o sqlite3.lo ../sqlite-autoconf-3100000/sqlite3.c | gcc -DPACKAGE_NAME=\"sqlite\" -DPACKAGE_TARNAME=\"sqlite\" -DPACKAGE_VERSION=\"3.10.0\" -DPACKAGE_STRING=\"sqlite\ 3.10.0\" -DPACKAGE_BUGREPORT=\"http://www.sqlite.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"sqlite\" -DVERSION=\"3.10.0\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DHAVE_FDATASYNC=1 -DHAVE_USLEEP=1 -DHAVE_LOCALTIME_R=1 -DHAVE_GMTIME_R=1 -DHAVE_DECL_STRERROR_R=1 -DHAVE_STRERROR_R=1 -DHAVE_POSIX_FALLOCATE=1 -I. -I../sqlite-autoconf-3100000 -isystem/home/maxin/poky/build/tmp/sysroots/x86_64-linux/usr/include -D_REENTRANT=1 -DSQLITE_THREADSAFE=1 -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE -isystem/home/maxin/poky/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe -DUSE_PREAD -DSQLITE_ENABLE_COLUMN_METADATA -c -o sqlite3-shell.o `test -f 'shell.c' || echo '../sqlite-autoconf-3100000/'`shell.c | gcc -DPACKAGE_NAME=\"sqlite\" -DPACKAGE_TARNAME=\"sqlite\" -DPACKAGE_VERSION=\"3.10.0\" -DPACKAGE_STRING=\"sqlite\ 3.10.0\" -DPACKAGE_BUGREPORT=\"http://www.sqlite.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"sqlite\" -DVERSION=\"3.10.0\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DHAVE_FDATASYNC=1 -DHAVE_USLEEP=1 -DHAVE_LOCALTIME_R=1 -DHAVE_GMTIME_R=1 -DHAVE_DECL_STRERROR_R=1 -DHAVE_STRERROR_R=1 -DHAVE_POSIX_FALLOCATE=1 -I. -I../sqlite-autoconf-3100000 -isystem/home/maxin/poky/build/tmp/sysroots/x86_64-linux/usr/include -D_REENTRANT=1 -DSQLITE_THREADSAFE=1 -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE -isystem/home/maxin/poky/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe -DUSE_PREAD -DSQLITE_ENABLE_COLUMN_METADATA -c -o sqlite3.o ../sqlite-autoconf-3100000/sqlite3.c | x86_64-linux-libtool: compile: gcc -DPACKAGE_NAME=\"sqlite\" -DPACKAGE_TARNAME=\"sqlite\" -DPACKAGE_VERSION=\"3.10.0\" "-DPACKAGE_STRING=\"sqlite 3.10.0\"" -DPACKAGE_BUGREPORT=\"http://www.sqlite.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"sqlite\" -DVERSION=\"3.10.0\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DHAVE_FDATASYNC=1 -DHAVE_USLEEP=1 -DHAVE_LOCALTIME_R=1 -DHAVE_GMTIME_R=1 -DHAVE_DECL_STRERROR_R=1 -DHAVE_STRERROR_R=1 -DHAVE_POSIX_FALLOCATE=1 -I. -I../sqlite-autoconf-3100000 -isystem/home/maxin/poky/build/tmp/sysroots/x86_64-linux/usr/include -D_REENTRANT=1 -DSQLITE_THREADSAFE=1 -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE -isystem/home/maxin/poky/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe -DUSE_PREAD -DSQLITE_ENABLE_COLUMN_METADATA -c ../sqlite-autoconf-3100000/sqlite3.c -fPIC -DPIC -o .libs/sqlite3.o | x86_64-linux-libtool: compile: gcc -DPACKAGE_NAME=\"sqlite\" -DPACKAGE_TARNAME=\"sqlite\" -DPACKAGE_VERSION=\"3.10.0\" "-DPACKAGE_STRING=\"sqlite 3.10.0\"" -DPACKAGE_BUGREPORT=\"http://www.sqlite.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"sqlite\" -DVERSION=\"3.10.0\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DHAVE_FDATASYNC=1 -DHAVE_USLEEP=1 -DHAVE_LOCALTIME_R=1 -DHAVE_GMTIME_R=1 -DHAVE_DECL_STRERROR_R=1 -DHAVE_STRERROR_R=1 -DHAVE_POSIX_FALLOCATE=1 -I. -I../sqlite-autoconf-3100000 -isystem/home/maxin/poky/build/tmp/sysroots/x86_64-linux/usr/include -D_REENTRANT=1 -DSQLITE_THREADSAFE=1 -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE -isystem/home/maxin/poky/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe -DUSE_PREAD -DSQLITE_ENABLE_COLUMN_METADATA -c ../sqlite-autoconf-3100000/sqlite3.c -o sqlite3.o >/dev/null 2>&1 | ./x86_64-linux-libtool --tag=CC --mode=link gcc -D_REENTRANT=1 -DSQLITE_THREADSAFE=1 -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE -isystem/home/maxin/poky/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe -DUSE_PREAD -DSQLITE_ENABLE_COLUMN_METADATA -L/home/maxin/poky/build/tmp/sysroots/x86_64-linux/usr/lib -L/home/maxin/poky/build/tmp/sysroots/x86_64-linux/lib -Wl,-rpath-link,/home/maxin/poky/build/tmp/sysroots/x86_64-linux/usr/lib -Wl,-rpath-link,/home/maxin/poky/build/tmp/sysroots/x86_64-linux/lib -Wl,-rpath,/home/maxin/poky/build/tmp/sysroots/x86_64-linux/usr/lib -Wl,-rpath,/home/maxin/poky/build/tmp/sysroots/x86_64-linux/lib -Wl,-O1 -o sqlite3 sqlite3-shell.o sqlite3.o -ldl -lpthread | x86_64-linux-libtool: link: gcc -D_REENTRANT=1 -DSQLITE_THREADSAFE=1 -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE -isystem/home/maxin/poky/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe -DUSE_PREAD -DSQLITE_ENABLE_COLUMN_METADATA -Wl,-rpath-link -Wl,/home/maxin/poky/build/tmp/sysroots/x86_64-linux/usr/lib -Wl,-rpath-link -Wl,/home/maxin/poky/build/tmp/sysroots/x86_64-linux/lib -Wl,-rpath -Wl,/home/maxin/poky/build/tmp/sysroots/x86_64-linux/usr/lib -Wl,-rpath -Wl,/home/maxin/poky/build/tmp/sysroots/x86_64-linux/lib -Wl,-O1 -o sqlite3 sqlite3-shell.o sqlite3.o -L/home/maxin/poky/build/tmp/sysroots/x86_64-linux/usr/lib -L/home/maxin/poky/build/tmp/sysroots/x86_64-linux/lib -ldl -lpthread | sqlite3.o: file not recognized: File truncated | collect2: error: ld returned 1 exit status | Makefile:507: recipe for target 'sqlite3' failed | make: *** [sqlite3] Error 1 | make: *** Waiting for unfinished jobs.... | ERROR: oe_runmake failed | ERROR: Function failed: do_compile (log file is located at /home/maxin/poky/build/tmp/work/x86_64-linux/sqlite3-native/3_3.10.0-r0/temp/log.do_compile.31853) ERROR: Task 142 (virtual:native:/home/maxin/poky/meta/recipes-support/sqlite/sqlite3_3.10.0.bb, do_compile) failed with exit code '1' NOTE: Tasks Summary: Attempted 354 tasks of which 340 didn't need to be rerun and 1 failed. No currently running tasks (354 of 518) Summary: 1 task failed: virtual:native:/home/maxin/poky/meta/recipes-support/sqlite/sqlite3_3.10.0.bb, do_compile Summary: There were 2 ERROR messages shown, returning a non-zero exit code. > >> + include_HEADERS = sqlite3.h sqlite3ext.h > >> diff --git a/meta/recipes-support/sqlite/sqlite3_3.9.2.bb b/meta/recipes-support/sqlite/sqlite3_3.10.0.bb > >> similarity index 71% > >> rename from meta/recipes-support/sqlite/sqlite3_3.9.2.bb > >> rename to meta/recipes-support/sqlite/sqlite3_3.10.0.bb > >> index 18b1a2b..092f782 100644 > >> --- a/meta/recipes-support/sqlite/sqlite3_3.9.2.bb > >> +++ b/meta/recipes-support/sqlite/sqlite3_3.10.0.bb > >> @@ -10,10 +10,12 @@ def sqlite_download_version(d): > >> > >> PE = "3" > >> SQLITE_PV = "${@sqlite_download_version(d)}" > >> -SRC_URI = "http://www.sqlite.org/2015/sqlite-autoconf-${SQLITE_PV}.tar.gz" > >> +SRC_URI = "http://www.sqlite.org/2016/sqlite-autoconf-${SQLITE_PV}.tar.gz \ > >> + file://parallel.patch \ > >> + " > >> > >> -SRC_URI[md5sum] = "bc4eb5b3fc5cfcb6e059794306cac1ca" > >> -SRC_URI[sha256sum] = "064c0abe9c9177534d4c770bca7a5902f9924b629ac886b4c08956be6dfbc36b" > >> +SRC_URI[md5sum] = "274364e6ca5c1104d42912f11e61ed26" > >> +SRC_URI[sha256sum] = "43cc292d70711fa7580250c8a1cd7c64813a4a0a479dbd502cce5f10b5d91042" > >> > >> UPSTREAM_CHECK_URI = "http://www.sqlite.org/" > >> UPSTREAM_CHECK_REGEX = "releaselog/(?P<pver>(\d+[\.\-_]*)+)\.html" > >> -- > >> 2.4.0 > >> Best Regards, Maxin ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] sqlite3: upgrade to version 3.10.0 2016-01-22 7:08 ` Andre McCurdy 2016-01-22 19:02 ` Andre McCurdy @ 2016-01-22 19:05 ` Mark Hatle 1 sibling, 0 replies; 5+ messages in thread From: Mark Hatle @ 2016-01-22 19:05 UTC (permalink / raw) To: Andre McCurdy, Maxin B. John; +Cc: OE Core mailing list On 1/22/16 1:08 AM, Andre McCurdy wrote: > On Wed, Jan 13, 2016 at 2:46 AM, Maxin B. John <maxin.john@intel.com> wrote: >> 3.9.2 -> 3.10.0 >> >> 1. Fixed a parallel build problem >> 2. Added a PACKAGECONFIG for readline >> >> Signed-off-by: Maxin B. John <maxin.john@intel.com> >> --- >> meta/recipes-support/sqlite/sqlite3.inc | 2 ++ >> meta/recipes-support/sqlite/sqlite3/parallel.patch | 24 ++++++++++++++++++++++ >> .../sqlite/{sqlite3_3.9.2.bb => sqlite3_3.10.0.bb} | 8 +++++--- >> 3 files changed, 31 insertions(+), 3 deletions(-) >> create mode 100644 meta/recipes-support/sqlite/sqlite3/parallel.patch >> rename meta/recipes-support/sqlite/{sqlite3_3.9.2.bb => sqlite3_3.10.0.bb} (71%) >> >> diff --git a/meta/recipes-support/sqlite/sqlite3.inc b/meta/recipes-support/sqlite/sqlite3.inc >> index 2e3791b..5eb5de3 100644 >> --- a/meta/recipes-support/sqlite/sqlite3.inc >> +++ b/meta/recipes-support/sqlite/sqlite3.inc >> @@ -9,6 +9,8 @@ inherit autotools pkgconfig >> >> EXTRA_OECONF = "--enable-shared --enable-threadsafe" >> EXTRA_OECONF_class-native = "--enable-shared --enable-threadsafe --disable-readline" >> +PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline" > > Adding this without also adding PACKAGECONFIG ?= "readline" or similar > means target sqlite3 will now build with readline support disabled. > > Was that the intention? When I'd looked at this I had assumed it was.. but you are right, if it was deliberate, this should be noted in the commit message. (I'd like to see readline removed from things like this simple due to the license contamination aspect. Moving to editline or similar -- or no 'readline like behavior' is fine with me as well.) --Mark >> export config_BUILD_CC = "${BUILD_CC}" >> export config_BUILD_CFLAGS = "${BUILD_CFLAGS}" >> export config_BUILD_LIBS = "${BUILD_LDFLAGS}" >> diff --git a/meta/recipes-support/sqlite/sqlite3/parallel.patch b/meta/recipes-support/sqlite/sqlite3/parallel.patch >> new file mode 100644 >> index 0000000..87471f0 >> --- /dev/null >> +++ b/meta/recipes-support/sqlite/sqlite3/parallel.patch >> @@ -0,0 +1,24 @@ >> +build: Fix parallel build problems >> + >> +Avoid parallel build errors related to sqlite3.o target. >> + >> +Upstream-Status: Pending >> + >> +Signed-off-by: Maxin B. John <maxin.john@intel.com> >> +--- >> +diff -Naur sqlite-autoconf-3100000-orig/Makefile.am sqlite-autoconf-3100000/Makefile.am >> +--- sqlite-autoconf-3100000-orig/Makefile.am 2016-01-06 14:03:00.000000000 +0200 >> ++++ sqlite-autoconf-3100000/Makefile.am 2016-01-12 13:14:03.620117514 +0200 >> +@@ -6,10 +6,8 @@ >> + libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8 >> + >> + bin_PROGRAMS = sqlite3 >> +-sqlite3_SOURCES = shell.c sqlite3.h >> +-EXTRA_sqlite3_SOURCES = sqlite3.c >> +-sqlite3_LDADD = @EXTRA_SHELL_OBJ@ @READLINE_LIBS@ >> +-sqlite3_DEPENDENCIES = @EXTRA_SHELL_OBJ@ >> ++sqlite3_SOURCES = shell.c sqlite3.c sqlite3.h >> ++sqlite3_LDADD = @READLINE_LIBS@ >> + sqlite3_CFLAGS = $(AM_CFLAGS) >> + >> + include_HEADERS = sqlite3.h sqlite3ext.h >> diff --git a/meta/recipes-support/sqlite/sqlite3_3.9.2.bb b/meta/recipes-support/sqlite/sqlite3_3.10.0.bb >> similarity index 71% >> rename from meta/recipes-support/sqlite/sqlite3_3.9.2.bb >> rename to meta/recipes-support/sqlite/sqlite3_3.10.0.bb >> index 18b1a2b..092f782 100644 >> --- a/meta/recipes-support/sqlite/sqlite3_3.9.2.bb >> +++ b/meta/recipes-support/sqlite/sqlite3_3.10.0.bb >> @@ -10,10 +10,12 @@ def sqlite_download_version(d): >> >> PE = "3" >> SQLITE_PV = "${@sqlite_download_version(d)}" >> -SRC_URI = "http://www.sqlite.org/2015/sqlite-autoconf-${SQLITE_PV}.tar.gz" >> +SRC_URI = "http://www.sqlite.org/2016/sqlite-autoconf-${SQLITE_PV}.tar.gz \ >> + file://parallel.patch \ >> + " >> >> -SRC_URI[md5sum] = "bc4eb5b3fc5cfcb6e059794306cac1ca" >> -SRC_URI[sha256sum] = "064c0abe9c9177534d4c770bca7a5902f9924b629ac886b4c08956be6dfbc36b" >> +SRC_URI[md5sum] = "274364e6ca5c1104d42912f11e61ed26" >> +SRC_URI[sha256sum] = "43cc292d70711fa7580250c8a1cd7c64813a4a0a479dbd502cce5f10b5d91042" >> >> UPSTREAM_CHECK_URI = "http://www.sqlite.org/" >> UPSTREAM_CHECK_REGEX = "releaselog/(?P<pver>(\d+[\.\-_]*)+)\.html" >> -- >> 2.4.0 >> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core@lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-01-25 9:40 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-01-13 10:46 [PATCH v2] sqlite3: upgrade to version 3.10.0 Maxin B. John 2016-01-22 7:08 ` Andre McCurdy 2016-01-22 19:02 ` Andre McCurdy 2016-01-25 9:43 ` Maxin B. John 2016-01-22 19:05 ` Mark Hatle
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox