git:master:0529cc90: db_oracle: update Makefile for oracle 12.2 client - sr-dev

26 Sep 2017

Module: kamailio
Branch: master
Commit: 0529cc90ef9402c33944e9e1570c295f5fad6d80
URL: https://github.com/kamailio/kamailio/commit/0529cc90ef9402c33944e9e1570c295f...
Author: Ovidiu Sas osas@voipembedded.com
Committer: Ovidiu Sas osas@voipembedded.com
Date: 2017-09-26T10:39:18-04:00
db_oracle: update Makefile for oracle 12.2 client
---
Modified: src/modules/db_oracle/Makefile
---
Diff:  https://github.com/kamailio/kamailio/commit/0529cc90ef9402c33944e9e1570c295f...
Patch: https://github.com/kamailio/kamailio/commit/0529cc90ef9402c33944e9e1570c295f...
---

diff --git a/src/modules/db_oracle/Makefile b/src/modules/db_oracle/Makefile
index 0787a16cf0..b57192c857 100644
--- a/src/modules/db_oracle/Makefile
+++ b/src/modules/db_oracle/Makefile
@@ -5,60 +5,9 @@ include ../../Makefile.defs
 auto_gen=
 NAME=db_oracle.so
-# can be defined for non standard placement of oracle so's
-ORAPATH=/usr/lib/oracle/xe/app/oracle/product/10.2.0/client
-DEFS += -I$(ORAPATH)/rdbms/public
-LIBS += -L$(ORAPATH)/lib
-
-
-# use for multiple client sdk version install
-ifneq ($(ORAVERSION),)
-    ORAVERDIR=/$(ORAVERSION)
-endif
-
-# use include/library path's for full client installation
-ifneq ($(ORAHOME),)
-    DEFS +=-I$(ORAHOME)/include
-    LIBS +=-L$(ORAHOME)/lib
-ifeq ($(ORAPATH),)
-    ORAPATH=$(ORAHOME)/lib
-endif
-else
-# use standard know paths oci.h locations (linux)
-DEFS +=-I$(LOCALBASE)/include/oracle$(ORAVERDIR) \
-    -I$(SYSBASE)/include/oracle$(ORAVERDIR)
-endif
-
-# search 'so' path if it non standard (possible liboclntsh locations on linux)
-ifeq ($(ORAPATH),)
-    ORAPATH=$(shell [ -f $(LOCALBASE)/lib64/oracle$(ORAVERDIR)/libocci.so ] && \
-	    echo $(LOCALBASE)/lib64/oracle$(ORAVERDIR) )
-endif
-ifeq ($(ORAPATH),)
-    ORAPATH=$(shell [ -f $(SYSBASE)/lib64/oracle$(ORAVERDIR)/libocci.so ] && \
-	    echo $(SYSBASE)/lib64/oracle$(ORAVERDIR) )
-endif
-ifeq ($(ORAPATH),)
-    ORAPATH=$(shell [ -f $(SYSBASE)/lib/oracle$(ORAVERDIR)/libocci.so ] && \
-	    echo $(SYSBASE)/lib/oracle$(ORAVERDIR) )
-endif
-ifeq ($(ORAPATH),)
-    ORAPATH=$(shell [ -f $(SYSBASE)/lib/oracle$(ORAVERDIR)/libocci.so ] && \
-	    echo $(SYSBASE)/lib/oracle$(ORAVERDIR) )
-endif
-
-ifneq ($(ORAPATH),)
-    LIBS +=-L$(ORAPATH)
-endif
-
-LIBS +=-locci -lclntsh
-
-#DEFS+=-DLINUX -D_GNU_SOURCE -D_REENTRANT
-#LIBS+=-lpthread
-
-ifneq ($(ORAPATH),)
-    LIBS +=-Wl,-rpath $(ORAPATH)
-endif
+# default path for oracle 12.2 client
+DEFS +=-I/usr/include/oracle/12.2/client64
+LIBS +=-locci -lclntsh -L/usr/lib/oracle/12.2/client64/lib
DEFS+=-DKAMAILIO_MOD_INTERFACE

    