Debian 10 build fix

mridoni · Sep 28, 2023 · 88c94b2 · 88c94b2
1 parent 9bbbdbc
commit 88c94b2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/gixsql-debian-packages.yml b/.github/workflows/gixsql-debian-packages.yml
@@ -48,7 +48,6 @@ jobs:
         ./configure --prefix=$WORKSPACE/pkg/${{ env.INSTALL_PREFIX }}
         make -j$(nproc) && make install-strip
         chmod 755 ./deploy/installers/linux/mkdeb-gixsql.sh && ./deploy/installers/linux/mkdeb-gixsql.sh
-        ls -lR $WORKSPACE
     
 #    - name: Build package
 #      env:
@@ -96,8 +95,6 @@ jobs:
         ./configure --prefix=$WORKSPACE/pkg/${{ env.INSTALL_PREFIX }}
         make -j$(nproc) && make install-strip
         chmod 755 $WORKSPACE/deploy/installers/linux/mkdeb-gixsql.sh && $WORKSPACE/deploy/installers/linux/mkdeb-gixsql.sh
-        ls -l
-        ls -lR $WORKSPACE/pkg
     
 #    - name: Build package
 #      env:
@@ -143,8 +140,6 @@ jobs:
         ./configure --prefix=$WORKSPACE/pkg/${{ env.INSTALL_PREFIX }}
         make -j$(nproc) && make install-strip
         chmod 755 $WORKSPACE/deploy/installers/linux/mkdeb-gixsql.sh && $WORKSPACE/deploy/installers/linux/mkdeb-gixsql.sh
-        ls -l
-        ls -lR $WORKSPACE/pkg
     
 #    - name: Build package
 #      env:

diff --git a/runtime/libgixsql/gixsql.cpp b/runtime/libgixsql/gixsql.cpp
@@ -1623,9 +1623,14 @@ static bool gixsql_initialize()
 		{
 			unsigned long rotate_max_size;
 			int rotate_max_files;
-			bool rotate_on_open;
+			bool rotate_on_open;	// Not available on spdlog < 1.4.0
 			get_log_rotation_parameters(&rotate_max_size, &rotate_max_files, &rotate_on_open);
+
+#if SPDLOG_VERSION >= 10400
 			gixsql_std_sink = std::make_shared<spdlog::sinks::rotating_file_sink_mt>(filename, rotate_max_size, rotate_max_files, rotate_on_open);
+#else
+			gixsql_std_sink = std::make_shared<spdlog::sinks::rotating_file_sink_mt>(filename, rotate_max_size, rotate_max_files);
+#endif
 		}
 	}