diff options
author | fuzzard <fuzzard@kodi.tv> | 2022-09-24 08:42:30 +1000 |
---|---|---|
committer | fuzzard <fuzzard@kodi.tv> | 2022-09-24 08:42:30 +1000 |
commit | e29523ecd3443aba0f85c8729a607c652d3d25f8 (patch) | |
tree | 93f19cf27e7d3740d748b52440b9f50bf42183ab /tools | |
parent | 02755860985937ef05361562c76e900b9ac6aa48 (diff) |
[tools/depends][target] sqlite3 remove binary build completely
The method to SED remove the binary build leaves the following warnings
21:28:01 Makefile.am:9: warning: variable 'EXTRA_sqlite3_SOURCES' is defined but no program or
21:28:01 Makefile.am:9: library has 'sqlite3' as canonical name (possible typo)
21:28:01 Makefile.am:8: warning: variable 'sqlite3_SOURCES' is defined but no program or
21:28:01 Makefile.am:8: library has 'sqlite3' as canonical name (possible typo)
21:28:01 Makefile.am:10: warning: variable 'sqlite3_LDADD' is defined but no program or
21:28:01 Makefile.am:10: library has 'sqlite3' as canonical name (possible typo)
21:28:01 Makefile.am:11: warning: variable 'sqlite3_DEPENDENCIES' is defined but no program or
21:28:01 Makefile.am:11: library has 'sqlite3' as canonical name (possible typo
This will occasionally cause jenkins to fail due to Clang warnings threshold.
New patch will just remove all binary flags in Makefile.am
Diffstat (limited to 'tools')
-rw-r--r-- | tools/depends/target/sqlite3/001-Disable-sqlite3bin.patch | 16 | ||||
-rw-r--r-- | tools/depends/target/sqlite3/Makefile | 20 | ||||
-rw-r--r-- | tools/depends/target/sqlite3/SQLITE3-VERSION | 4 |
3 files changed, 26 insertions, 14 deletions
diff --git a/tools/depends/target/sqlite3/001-Disable-sqlite3bin.patch b/tools/depends/target/sqlite3/001-Disable-sqlite3bin.patch new file mode 100644 index 0000000000..4500b0259b --- /dev/null +++ b/tools/depends/target/sqlite3/001-Disable-sqlite3bin.patch @@ -0,0 +1,16 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -4,13 +4,6 @@ + libsqlite3_la_SOURCES = sqlite3.c + 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_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_ENABLE_STMTVTAB -DSQLITE_ENABLE_DBSTAT_VTAB $(SHELL_CFLAGS) +- + include_HEADERS = sqlite3.h sqlite3ext.h + + EXTRA_DIST = sqlite3.1 tea Makefile.msc sqlite3.rc sqlite3rc.h README.txt Replace.cs Makefile.fallback diff --git a/tools/depends/target/sqlite3/Makefile b/tools/depends/target/sqlite3/Makefile index 48e6b52da7..a09a03a9f8 100644 --- a/tools/depends/target/sqlite3/Makefile +++ b/tools/depends/target/sqlite3/Makefile @@ -1,13 +1,7 @@ -include ../../Makefile.include -DEPS = ../../Makefile.include Makefile sqlite3.c.patch ../../download-files.include - -# lib name, version -LIBNAME=sqlite -VERSION=3360000 -SOURCE=$(LIBNAME)-autoconf-$(VERSION) -ARCHIVE=$(SOURCE).tar.gz -SHA512=e59c57f421b4956c7759af528a2da929167e15179ab9d28267474683e2272f93c901203e5a648732f1a3d43e7be3ac4217c3cdd7adf108c378b9127b771a7cd0 -include ../../download-files.include +include ../../Makefile.include SQLITE3-VERSION ../../download-files.include +DEPS = ../../Makefile.include SQLITE3-VERSION Makefile ../../download-files.include \ + 001-Disable-sqlite3bin.patch \ + sqlite3.c.patch # configuration settings export CXXFLAGS+=-DSQLITE_ENABLE_COLUMN_METADATA=1 @@ -19,16 +13,15 @@ LIBDYLIB=$(PLATFORM)/.libs/lib$(LIBNAME)3.a all: .installed-$(PLATFORM) - $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE) $(DEPS) rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) + # do not build the program sqlite3 + cd $(PLATFORM); patch -p1 -i ../001-Disable-sqlite3bin.patch # seems MAP_POPULATE is broken on aarch64 ifneq ($(OS),android) cd $(PLATFORM); patch -p1 -i ../sqlite3.c.patch endif - # do not build the program sqlite3 - sed -ie "s|bin_PROGRAMS = sqlite3||" "$(PLATFORM)/Makefile.am"; cd $(PLATFORM); $(AUTORECONF) -vif cd $(PLATFORM); $(CONFIGURE) @@ -45,4 +38,3 @@ clean: distclean:: rm -rf $(PLATFORM) .installed-$(PLATFORM) - diff --git a/tools/depends/target/sqlite3/SQLITE3-VERSION b/tools/depends/target/sqlite3/SQLITE3-VERSION new file mode 100644 index 0000000000..ef3e9d99c4 --- /dev/null +++ b/tools/depends/target/sqlite3/SQLITE3-VERSION @@ -0,0 +1,4 @@ +LIBNAME=sqlite +VERSION=3360000 +ARCHIVE=$(LIBNAME)-autoconf-$(VERSION).tar.gz +SHA512=e59c57f421b4956c7759af528a2da929167e15179ab9d28267474683e2272f93c901203e5a648732f1a3d43e7be3ac4217c3cdd7adf108c378b9127b771a7cd0 |