commit bebfe676bda2c7b0ccd00a58a9246dd5c5aae76b
Author: Elan Ruusamäe <[email protected]>
Date: Sat Apr 20 23:16:24 2013 +0300
hack for system sqlite
-DUSE_SYSTEM_SQLITE is missing when building some objects:
glen@carme-pld BUILD/chromium-browser-27.0.1453.56 $ make chrome
CXX(target)
out/Debug/obj.target/content_common/content/common/database_util.o
In file included from content/common/database_util.cc:11:0:
./third_party/sqlite/sqlite3.h:15:53: fatal error:
third_party/sqlite/amalgamation/sqlite3.h: No such file or directory
compilation terminated.
make: ***
[out/Debug/obj.target/content_common/content/common/database_util.o] Error 1
clean-source.sh | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/clean-source.sh b/clean-source.sh
index 486bb6f..b2fc1cf 100755
--- a/clean-source.sh
+++ b/clean-source.sh
@@ -629,7 +629,7 @@ strip_system_dirs() {
# skip already removed dirs
test -d $dir || continue
- find $dir -depth -mindepth 1 \! \( -name '*.gyp' -o -name
'*.gypi' -o -path $dir/$lib.h -o -path third_party/sqlite/sqlite3.h \) -print
-delete
+ find $dir -depth -mindepth 1 \! \( -name '*.gyp' -o -name
'*.gypi' -o -path $dir/$lib.h \) -print -delete
done
}
@@ -940,6 +940,11 @@ strip_system_dirs \
v8 \
> REMOVED-system_dirs.txt
+if [ "${sqlite:-1}" = 1 ]; then
+ # some code does not pass -DUSE_SYSTEM_SQLITE properly
+ ln -sf /usr/include/sqlite3.h third_party/sqlite/sqlite3.h
+fi
+
clean_third_party > REMOVED-third_party.txt
if [ "${v8:-1}" != "0" ]; then
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser.git/commitdiff/bebfe676bda2c7b0ccd00a58a9246dd5c5aae76b
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
