summaryrefslogtreecommitdiff
path: root/stage
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2024-05-27 08:06:09 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2024-05-27 08:06:09 +0200
commit796dfd648a3970e4f952c767fd149381467bc84a (patch)
treea60e062d4d59feede438fab580e88893952f8655 /stage
parent4407bf941d66d02a8836763abcb8e83ae982c418 (diff)
Update stage scripts with ODB-related changes
Diffstat (limited to 'stage')
-rwxr-xr-xstage31
1 files changed, 20 insertions, 11 deletions
diff --git a/stage b/stage
index d9d3df4..2c572b3 100755
--- a/stage
+++ b/stage
@@ -275,7 +275,7 @@ etc/stage-pkg -c $mode -d openssl packaging/openssl/openssl/libcrypto \
packaging/openssl/openssl/libssl \
packaging/openssl/openssl/openssl
-etc/stage-pkg -c $mode -d mariadb packaging/mariadb/libmariadb
+#etc/stage-pkg -c $mode -d mariadb packaging/mariadb/libmariadb
etc/stage-pkg -c $mode -d mysql packaging/mysql/mysql/libmysqlclient
etc/stage-pkg -c $mode -d libcutl ../cutl/libcutl
@@ -289,7 +289,9 @@ etc/stage-pkg -c $mode -d cli ../cli/cli/cli-examples
etc/stage-pkg -c $mode -d libapr packaging/libapr/libapr1
etc/stage-pkg -c $mode -d libapreq packaging/libapreq/libapreq2
-etc/stage-pkg -c $mode -d postgresql packaging/postgresql/postgresql/libpq
+etc/stage-pkg -c $mode -d postgresql \
+ packaging/postgresql/postgresql/libpq \
+ packaging/postgresql/postgresql/psql
etc/stage-pkg -c $mode -d sqlite \
packaging/sqlite/sqlite/libsqlite3 \
@@ -307,16 +309,23 @@ etc/stage-pkg -c $mode -d hello hello/libhello-1.0
# For testing we also stage other libodb-*.
#
+# Note: cannot have odb-tests/odb-example since depend on mysql-client (which
+# depends on libisocline which doesn't build with -Werror).
+#
etc/stage-pkg -c $mode -d odb \
- ../odb/odb \
- ../odb/builds/default/libodb \
- ../odb/builds/default/libodb-sqlite \
- ../odb/builds/default/libodb-pgsql \
- ../odb/builds/default/libodb-mysql \
- ../odb/builds/default/libodb-oracle \
- ../odb/builds/default/libodb-mssql \
- ../odb/builds/default/libodb-boost \
- ../odb/builds/default/libodb-qt
+ ../odb/odb/odb \
+ ../odb/odb/libodb \
+ ../odb/odb/libodb-sqlite \
+ ../odb/odb/libodb-pgsql \
+ ../odb/odb/libodb-mysql \
+ ../odb/odb/libodb-oracle \
+ ../odb/odb/libodb-mssql \
+ ../odb/odb/libodb-boost \
+ ../odb/odb/libodb-qt
+
+# ../odb/odb/odb-tests
+# ../odb/odb/odb-examples
+
# Regenerate the repository (unless $mode is -q) but do not publish.
#