sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-17 00:09:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

debian packaging: optional support for oracle instantclient 12.1

Browse Source
This commit is contained in:
Juergen E. Fischer 2016-01-29 21:34:07 +01:00
parent d4e400a425
commit 78d9617db0
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/control.in vendored
View File

@ -56,7 +56,7 @@ Build-Depends:
txt2tags, txt2tags,
xvfb, xauth, xvfb, xauth,
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable, xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable,
#oracle# oracle-instantclient11.2-devel, #oracle# oracle-instantclient12.1-devel,
spawn-fcgi, lighttpd, poppler-utils, locales, qt4-doc-html, spawn-fcgi, lighttpd, poppler-utils, locales, qt4-doc-html,
libqt4-sql-sqlite, python-psycopg2 libqt4-sql-sqlite, python-psycopg2
Build-Conflicts: libqgis-dev, qgis-dev Build-Conflicts: libqgis-dev, qgis-dev

17
debian/rules vendored
View File

@ -20,8 +20,10 @@ QGIS_BUILDDIR ?= debian/build
QGIS_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \([0-9]\+:\)\?\([^+-]\+\).*$$/\2/p') QGIS_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \([0-9]\+:\)\?\([^+-]\+\).*$$/\2/p')
ifeq (,$(DISTRIBUTION)) ifeq (,$(DIST))
DISTRIBUTION := $(shell dpkg-parsechangelog --format rfc822 | sed -ne "s/^Distribution: //p") DISTRIBUTION := $(shell dpkg-parsechangelog --format rfc822 | sed -ne "s/^Distribution: //p")
else
DISTRIBUTION := $(DIST)
endif endif
ifneq (,$(findstring -oracle,$(DISTRIBUTION))) ifneq (,$(findstring -oracle,$(DISTRIBUTION)))
@ -106,7 +108,18 @@ ifneq (,$(findstring $(DISTRIBUTION),"jessie stretch trusty utopic vivid wily si
endif endif
ifneq (,$(WITH_ORACLE)) ifneq (,$(WITH_ORACLE))
CMAKE_OPTS += -DWITH_ORACLE=TRUE ifeq ($(DEB_BUILD_ARCH),amd64)
CMAKE_OPTS += \
-DWITH_ORACLE=TRUE \
-DORACLE_INCLUDEDIR=/usr/include/oracle/12.1/client64/ \
-DORACLE_LIBDIR=/usr/lib/oracle/12.1/client64/lib/
endif
ifeq ($(DEB_BUILD_ARCH),i386)
CMAKE_OPTS += \
-DWITH_ORACLE=TRUE \
-DORACLE_INCLUDEDIR=/usr/include/oracle/12.1/client/ \
-DORACLE_LIBDIR=/usr/lib/oracle/12.1/client/lib/
endif
endif endif
ifneq (,$(findstring $(DISTRIBUTION),"sid stretch jessie")) ifneq (,$(findstring $(DISTRIBUTION),"sid stretch jessie"))

2
src/providers/oracle/ocispatial/cmake/FindOCI.cmake
View File

@ -13,7 +13,6 @@
FIND_PATH(OCI_INCLUDE_DIR oci.h FIND_PATH(OCI_INCLUDE_DIR oci.h
PATHS PATHS
${ORACLE_INCLUDEDIR} ${ORACLE_INCLUDEDIR}
/usr/include/oracle/11.2/client64
$ENV{OSGEO4W_ROOT}/include $ENV{OSGEO4W_ROOT}/include
$ENV{ORACLE_HOME}/rdbms/public $ENV{ORACLE_HOME}/rdbms/public
) )
@ -21,7 +20,6 @@ FIND_PATH(OCI_INCLUDE_DIR oci.h
FIND_LIBRARY(OCI_LIBRARY clntsh oci FIND_LIBRARY(OCI_LIBRARY clntsh oci
PATHS PATHS
${ORACLE_LIBDIR} ${ORACLE_LIBDIR}
/usr/lib/oracle/11.2/client64/lib/
$ENV{OSGEO4W_ROOT}/lib $ENV{OSGEO4W_ROOT}/lib
$ENV{ORACLE_HOME}/lib $ENV{ORACLE_HOME}/lib
) )