From 796dfd648a3970e4f952c767fd149381467bc84a Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 27 May 2024 08:06:09 +0200
Subject: Update stage scripts with ODB-related changes

---
 stage | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

(limited to 'stage')

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.
 #
-- 
cgit v1.1