Skip to content
Permalink
Browse files

debian packaging: optional support for oracle instantclient 12.1

  • Loading branch information
jef-n committed Jan 29, 2016
1 parent d4e400a commit 78d9617db09cec7b9f9a4eb0f308cbea4d5ac179
Showing with 16 additions and 5 deletions.
  1. +1 −1 debian/control.in
  2. +15 −2 debian/rules
  3. +0 −2 src/providers/oracle/ocispatial/cmake/FindOCI.cmake
@@ -56,7 +56,7 @@ Build-Depends:
txt2tags,
xvfb, xauth,
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,
libqt4-sql-sqlite, python-psycopg2
Build-Conflicts: libqgis-dev, qgis-dev
@@ -20,8 +20,10 @@ QGIS_BUILDDIR ?= debian/build

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")
else
DISTRIBUTION := $(DIST)
endif

ifneq (,$(findstring -oracle,$(DISTRIBUTION)))
@@ -106,7 +108,18 @@ ifneq (,$(findstring $(DISTRIBUTION),"jessie stretch trusty utopic vivid wily si
endif

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

ifneq (,$(findstring $(DISTRIBUTION),"sid stretch jessie"))
@@ -13,15 +13,13 @@
FIND_PATH(OCI_INCLUDE_DIR oci.h
PATHS
${ORACLE_INCLUDEDIR}
/usr/include/oracle/11.2/client64
$ENV{OSGEO4W_ROOT}/include
$ENV{ORACLE_HOME}/rdbms/public
)

FIND_LIBRARY(OCI_LIBRARY clntsh oci
PATHS
${ORACLE_LIBDIR}
/usr/lib/oracle/11.2/client64/lib/
$ENV{OSGEO4W_ROOT}/lib
$ENV{ORACLE_HOME}/lib
)

0 comments on commit 78d9617

Please sign in to comment.
You can’t perform that action at this time.