Skip to content

Commit

Permalink
RHEL build fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
mridoni committed Jun 14, 2023
1 parent bb1d270 commit 79f6247
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/gixsql-el8-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ env:
GIX_REVISION: ${{ github.run_attempt }}
GIXSQL_BRANCH: ${{ github.ref_name }}
INSTALL_PREFIX: usr
PKGVER: 3
PKGVER: 4

permissions:
contents: read
Expand Down
2 changes: 1 addition & 1 deletion runtime/libgixsql-mysql/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ libgixsql_mysql_la_SOURCES = DbInterfaceManagerMySQL.cpp DbInterfaceMySQL.cpp

libgixsql_mysql_la_CXXFLAGS = $(MYSQL_CFLAGS) $(MARIADB_CFLAGS) -I$(top_srcdir)/common -I$(top_srcdir)/runtime/libgixsql -std=c++17 -DSPDLOG_FMT_EXTERNAL -DNDEBUG
libgixsql_mysql_la_LIBADD = $(MYSQL_LIBS) $(MARIADB_LIBS)
libgixsql_mysql_la_LDFLAGS = -lfmt -no-undefined -avoid-version
libgixsql_mysql_la_LDFLAGS = -lfmt -lstdc++fs -no-undefined -avoid-version


2 changes: 1 addition & 1 deletion runtime/libgixsql-odbc/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ libgixsql_odbc_la_CXXFLAGS = $(ODBC_CFLAGS) -I$(top_srcdir)/common -I$(top_srcdi
libgixsql_odbc_la_LIBADD = $(ODBC_LIBS)
endif

libgixsql_odbc_la_LDFLAGS = -lfmt -no-undefined -avoid-version
libgixsql_odbc_la_LDFLAGS = -lfmt -lstdc++fs -no-undefined -avoid-version
2 changes: 1 addition & 1 deletion runtime/libgixsql-oracle/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ libgixsql_oracle_la_SOURCES = DbInterfaceManagerOracle.cpp DbInterfaceOracle.cp
libgixsql_oracle_la_CXXFLAGS = -I $(srcdir)/odpi -I$(top_srcdir)/common -I$(top_srcdir)/runtime/libgixsql -std=c++17 -DSPDLOG_FMT_EXTERNAL -DNDEBUG

libgixsql_oracle_la_LIBADD =
libgixsql_oracle_la_LDFLAGS = -lfmt -no-undefined -avoid-version
libgixsql_oracle_la_LDFLAGS = -lfmt -lstdc++fs -no-undefined -avoid-version



Expand Down
2 changes: 1 addition & 1 deletion runtime/libgixsql-pgsql/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ libgixsql_pgsql_la_SOURCES = DbInterfaceManagerPGSQL.cpp DbInterfacePGSQL.cpp

libgixsql_pgsql_la_CXXFLAGS = $(LIBPQ_CFLAGS) -I$(top_srcdir)/common -I$(top_srcdir)/runtime/libgixsql -I$(top_srcdir)/common -std=c++17 -DSPDLOG_FMT_EXTERNAL -DNDEBUG
libgixsql_pgsql_la_LIBADD = $(LIBPQ_LIBS)
libgixsql_pgsql_la_LDFLAGS = -lfmt -no-undefined -avoid-version
libgixsql_pgsql_la_LDFLAGS = -lfmt -lstdc++fs -no-undefined -avoid-version


2 changes: 1 addition & 1 deletion runtime/libgixsql-sqlite/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ libgixsql_sqlite_la_SOURCES = DbInterfaceManagerSQLite.cpp DbInterfaceSQLite.cp

libgixsql_sqlite_la_CXXFLAGS = -I$(top_srcdir)/common -I$(top_srcdir)/runtime/libgixsql -std=c++17 -DSPDLOG_FMT_EXTERNAL -DNDEBUG
libgixsql_sqlite_la_LIBADD =
libgixsql_sqlite_la_LDFLAGS = -lfmt -no-undefined -avoid-version
libgixsql_sqlite_la_LDFLAGS = -lfmt -lstdc++fs -no-undefined -avoid-version



Expand Down

0 comments on commit 79f6247

Please sign in to comment.