Skip to content
Snippets Groups Projects
Unverified Commit c7818fe0 authored by Ritesh Raj Sarraf's avatar Ritesh Raj Sarraf
Browse files

Reenable Postgres and Firebird support


Postgres and Firebird support was disabled during the Debian Buster
rebase because at that time we did not have these packages in our
Apertis repository.

These have been re-enabled now because the pacakges are now back in the
archive

Signed-off-by: default avatarRitesh Raj Sarraf <ritesh.sarraf@collabora.com>
parent 77ca2979
No related branches found
No related tags found
1 merge request!2Users/ritesh/merge updates dsa 4556
......@@ -12,7 +12,7 @@ Build-Depends: debhelper (>= 11),
default-libmysqlclient-dev,
dh-exec,
dpkg-dev (>= 1.17.14),
# firebird-dev [kfreebsd-any linux-any],
firebird-dev [kfreebsd-any linux-any],
freetds-dev,
libasound2-dev [linux-any],
libatspi2.0-dev,
......@@ -34,7 +34,7 @@ Build-Depends: debhelper (>= 11),
libmtdev-dev [linux-any],
libpcre2-dev,
libpng-dev,
# libpq-dev,
libpq-dev,
libproxy-dev,
libpulse-dev,
libsqlite3-dev,
......
#usr/lib/*/qt5/plugins/sqldrivers/libqsqlibase.so
usr/lib/*/qt5/plugins/sqldrivers/libqsqlibase.so
#usr/lib/*/qt5/plugins/sqldrivers/libqsqlpsql.so
usr/lib/*/qt5/plugins/sqldrivers/libqsqlpsql.so
......@@ -18,12 +18,11 @@ export PKG_CONFIG := /usr/bin/$(DEB_HOST_GNU_TYPE)-pkg-config
# Upstream changelog
upstream_changes := dist/changes-$(shell echo $(DEB_VERSION_UPSTREAM) | sed -e 's/+dfsg//' | sed -e 's/+git.*//')
#ifneq (,$(filter libqt5sql5-ibase,$(shell dh_listpackages)))
# extra_configure_opts += -plugin-sql-ibase
#else
# extra_configure_opts += -no-sql-ibase
#endif
extra_configure_opts += -no-sql-ibase
ifneq (,$(filter libqt5sql5-ibase,$(shell dh_listpackages)))
extra_configure_opts += -plugin-sql-ibase
else
extra_configure_opts += -no-sql-ibase
endif
no_pch_architectures := arm64
ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(no_pch_architectures)))
......@@ -92,6 +91,7 @@ override_dh_auto_configure:
-opensource \
-plugin-sql-mysql \
-plugin-sql-odbc \
-plugin-sql-psql \
-plugin-sql-sqlite \
-no-sql-sqlite2 \
-plugin-sql-tds \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment