|
 |
e73f7b5 |
From: Peter Lemenkov <lemenkov@gmail.com>
|
|
|
dd6e1a3 |
Date: Thu, 14 Jun 2012 11:38:48 +0400
|
|
|
fa3f242 |
Subject: [PATCH] Cleanup Oracle's makefiles
|
|
|
e73f7b5 |
|
|
|
e73f7b5 |
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
|
|
|
e73f7b5 |
|
|
|
e73f7b5 |
diff --git a/modules/db_oracle/Makefile b/modules/db_oracle/Makefile
|
|
|
b9a4805 |
index 3dfd1b7..a721aba 100644
|
|
|
e73f7b5 |
--- a/modules/db_oracle/Makefile
|
|
|
e73f7b5 |
+++ b/modules/db_oracle/Makefile
|
|
|
b9a4805 |
@@ -6,73 +6,7 @@ include ../../Makefile.defs
|
|
|
e73f7b5 |
auto_gen=
|
|
|
e73f7b5 |
NAME=db_oracle.so
|
|
|
e73f7b5 |
|
|
|
e73f7b5 |
-# can be defined for non standard placement of oracle so's
|
|
|
e73f7b5 |
-ORAPATH=
|
|
|
e73f7b5 |
-LIBS=
|
|
|
e73f7b5 |
-
|
|
|
e73f7b5 |
-# use for multiple client sdk version install
|
|
|
e73f7b5 |
-ifneq ($(ORAVERSION),)
|
|
|
e73f7b5 |
- ORAVERDIR=/$(ORAVERSION)
|
|
|
e73f7b5 |
-endif
|
|
|
e73f7b5 |
-
|
|
|
e73f7b5 |
-# use include/library path's for full client installation
|
|
|
e73f7b5 |
-ifneq ($(ORAHOME),)
|
|
|
e73f7b5 |
- DEFS +=-I$(ORAHOME)/include
|
|
|
e73f7b5 |
- LIBS +=-L$(ORAHOME)/lib
|
|
|
e73f7b5 |
-ifeq ($(ORAPATH),)
|
|
|
e73f7b5 |
- ORAPATH=$(ORAHOME)/lib
|
|
|
e73f7b5 |
-endif
|
|
|
e73f7b5 |
-else
|
|
|
e73f7b5 |
-# use standard know paths oci.h locations (linux)
|
|
|
e73f7b5 |
-DEFS +=-I$(LOCALBASE)/include/oracle$(ORAVERDIR) \
|
|
|
e73f7b5 |
- -I$(SYSBASE)/include/oracle$(ORAVERDIR)
|
|
|
e73f7b5 |
-endif
|
|
|
e73f7b5 |
-
|
|
|
e73f7b5 |
-# search 'so' path if it non standard (possible liboclntsh locations on linux)
|
|
|
e73f7b5 |
-ifeq ($(ORAPATH),)
|
|
|
e73f7b5 |
- ORAPATH=$(shell [ -f $(LOCALBASE)/lib64/oracle$(ORAVERDIR)/libocci.so ] && \
|
|
|
e73f7b5 |
- echo $(LOCALBASE)/lib64/oracle$(ORAVERDIR) )
|
|
|
e73f7b5 |
-endif
|
|
|
e73f7b5 |
-ifeq ($(ORAPATH),)
|
|
|
e73f7b5 |
- ORAPATH=$(shell [ -f $(SYSBASE)/lib64/oracle$(ORAVERDIR)/libocci.so ] && \
|
|
|
e73f7b5 |
- echo $(SYSBASE)/lib64/oracle$(ORAVERDIR) )
|
|
|
e73f7b5 |
-endif
|
|
|
e73f7b5 |
-ifeq ($(ORAPATH),)
|
|
|
b9a4805 |
- ORAPATH=$(shell [ -f $(LOCALBASE)/lib64/oracle$(ORAVERDIR)/lib/libocci.so ] && \
|
|
|
b9a4805 |
- echo $(LOCALBASE)/lib64/oracle$(ORAVERDIR)/lib )
|
|
|
b9a4805 |
-endif
|
|
|
b9a4805 |
-ifeq ($(ORAPATH),)
|
|
|
b9a4805 |
- ORAPATH=$(shell [ -f $(SYSBASE)/lib64/oracle$(ORAVERDIR)/lib/libocci.so ] && \
|
|
|
b9a4805 |
- echo $(SYSBASE)/lib64/oracle$(ORAVERDIR)/lib )
|
|
|
b9a4805 |
-endif
|
|
|
b9a4805 |
-ifeq ($(ORAPATH),)
|
|
|
b9a4805 |
- ORAPATH=$(shell [ -f $(LOCALBASE)/lib/oracle$(ORAVERDIR)/libocci.so ] && \
|
|
|
b9a4805 |
- echo $(LOCALBASE)/lib/oracle$(ORAVERDIR) )
|
|
|
e73f7b5 |
-endif
|
|
|
e73f7b5 |
-ifeq ($(ORAPATH),)
|
|
|
e73f7b5 |
- ORAPATH=$(shell [ -f $(SYSBASE)/lib/oracle$(ORAVERDIR)/libocci.so ] && \
|
|
|
e73f7b5 |
- echo $(SYSBASE)/lib/oracle$(ORAVERDIR) )
|
|
|
e73f7b5 |
-endif
|
|
|
b9a4805 |
-ifeq ($(ORAPATH),)
|
|
|
b9a4805 |
- ORAPATH=$(shell [ -f $(LOCALBASE)/lib/oracle$(ORAVERDIR)/lib/libocci.so ] && \
|
|
|
b9a4805 |
- echo $(LOCALBASE)/lib/oracle$(ORAVERDIR)/lib )
|
|
|
b9a4805 |
-endif
|
|
|
b9a4805 |
-ifeq ($(ORAPATH),)
|
|
|
b9a4805 |
- ORAPATH=$(shell [ -f $(SYSBASE)/lib/oracle$(ORAVERDIR)/lib/libocci.so ] && \
|
|
|
b9a4805 |
- echo $(SYSBASE)/lib/oracle$(ORAVERDIR)/lib )
|
|
|
b9a4805 |
-endif
|
|
|
e73f7b5 |
-
|
|
|
e73f7b5 |
-ifneq ($(ORAPATH),)
|
|
|
e73f7b5 |
- LIBS +=-L$(ORAPATH)
|
|
|
e73f7b5 |
-endif
|
|
|
e73f7b5 |
-
|
|
|
dd6e1a3 |
-LIBS +=-locci -lclntsh
|
|
|
dd6e1a3 |
-
|
|
|
e73f7b5 |
-#DEFS+=-DLINUX -D_GNU_SOURCE -D_REENTRANT
|
|
|
e73f7b5 |
-#LIBS+=-lpthread
|
|
|
e73f7b5 |
-
|
|
|
dd6e1a3 |
-ifneq ($(ORAPATH),)
|
|
|
dd6e1a3 |
- LIBS +=-Wl,-rpath $(ORAPATH)
|
|
|
dd6e1a3 |
-endif
|
|
|
dd6e1a3 |
+DEFS +=-I$(ORAHOME)/include
|
|
|
dd6e1a3 |
+LIBS +=-L$(ORAHOME)/lib -locci -lclntsh
|
|
|
dd6e1a3 |
|
|
|
e73f7b5 |
include ../../Makefile.modules
|
|
|
dd6e1a3 |
diff --git a/utils/db_oracle/Makefile b/utils/db_oracle/Makefile
|
|
|
b9a4805 |
index 1f1af8e..9565134 100644
|
|
|
dd6e1a3 |
--- a/utils/db_oracle/Makefile
|
|
|
dd6e1a3 |
+++ b/utils/db_oracle/Makefile
|
|
|
b9a4805 |
@@ -10,72 +10,8 @@ NAME=opensips_orasel
|
|
|
dd6e1a3 |
|
|
|
dd6e1a3 |
include ../../Makefile.sources
|
|
|
dd6e1a3 |
|
|
|
dd6e1a3 |
-ORAPATH=
|
|
|
dd6e1a3 |
-
|
|
|
dd6e1a3 |
-# use for multiple client sdk version install
|
|
|
dd6e1a3 |
-ifneq ($(ORAVERSION),)
|
|
|
dd6e1a3 |
- ORAVERDIR=/$(ORAVERSION)
|
|
|
dd6e1a3 |
-endif
|
|
|
dd6e1a3 |
-
|
|
|
dd6e1a3 |
-# use include/library path's for full client installation
|
|
|
dd6e1a3 |
-ifneq ($(ORAHOME),)
|
|
|
dd6e1a3 |
- DEFS +=-I$(ORAHOME)/include
|
|
|
dd6e1a3 |
- LIBS +=-L$(ORAHOME)/lib
|
|
|
dd6e1a3 |
-ifeq ($(ORAPATH),)
|
|
|
dd6e1a3 |
- ORAPATH=$(ORAHOME)/lib
|
|
|
dd6e1a3 |
-endif
|
|
|
dd6e1a3 |
-else
|
|
|
dd6e1a3 |
-# use standard know paths oci.h locations (linux)
|
|
|
dd6e1a3 |
- DEFS +=-I$(LOCALBASE)/include/oracle$(ORAVERDIR) \
|
|
|
dd6e1a3 |
- -I$(SYSBASE)/include/oracle$(ORAVERDIR)
|
|
|
dd6e1a3 |
-endif
|
|
|
dd6e1a3 |
-
|
|
|
dd6e1a3 |
-# search 'so' path if it non standard (possible liboclntsh locations on linux)
|
|
|
dd6e1a3 |
-ifeq ($(ORAPATH),)
|
|
|
dd6e1a3 |
- ORAPATH=$(shell [ -f $(LOCALBASE)/lib64/oracle$(ORAVERDIR)/libocci.so ] && \
|
|
|
dd6e1a3 |
- echo $(LOCALBASE)/lib64/oracle$(ORAVERDIR) )
|
|
|
dd6e1a3 |
-endif
|
|
|
dd6e1a3 |
-ifeq ($(ORAPATH),)
|
|
|
dd6e1a3 |
- ORAPATH=$(shell [ -f $(SYSBASE)/lib64/oracle$(ORAVERDIR)/libocci.so ] && \
|
|
|
dd6e1a3 |
- echo $(SYSBASE)/lib64/oracle$(ORAVERDIR) )
|
|
|
dd6e1a3 |
-endif
|
|
|
dd6e1a3 |
-ifeq ($(ORAPATH),)
|
|
|
b9a4805 |
- ORAPATH=$(shell [ -f $(LOCALBASE)/lib64/oracle$(ORAVERDIR)/lib/libocci.so ] && \
|
|
|
b9a4805 |
- echo $(LOCALBASE)/lib64/oracle$(ORAVERDIR)/lib )
|
|
|
b9a4805 |
-endif
|
|
|
b9a4805 |
-ifeq ($(ORAPATH),)
|
|
|
b9a4805 |
- ORAPATH=$(shell [ -f $(SYSBASE)/lib64/oracle$(ORAVERDIR)/lib/libocci.so ] && \
|
|
|
b9a4805 |
- echo $(SYSBASE)/lib64/oracle$(ORAVERDIR)/lib )
|
|
|
b9a4805 |
-endif
|
|
|
b9a4805 |
-ifeq ($(ORAPATH),)
|
|
|
b9a4805 |
- ORAPATH=$(shell [ -f $(LOCALBASE)/lib/oracle$(ORAVERDIR)/libocci.so ] && \
|
|
|
b9a4805 |
- echo $(LOCALBASE)/lib/oracle$(ORAVERDIR) )
|
|
|
dd6e1a3 |
-endif
|
|
|
dd6e1a3 |
-ifeq ($(ORAPATH),)
|
|
|
dd6e1a3 |
- ORAPATH=$(shell [ -f $(SYSBASE)/lib/oracle$(ORAVERDIR)/libocci.so ] && \
|
|
|
dd6e1a3 |
- echo $(SYSBASE)/lib/oracle$(ORAVERDIR) )
|
|
|
dd6e1a3 |
-endif
|
|
|
b9a4805 |
-ifeq ($(ORAPATH),)
|
|
|
b9a4805 |
- ORAPATH=$(shell [ -f $(LOCALBASE)/lib/oracle$(ORAVERDIR)/lib/libocci.so ] && \
|
|
|
b9a4805 |
- echo $(LOCALBASE)/lib/oracle$(ORAVERDIR)/lib )
|
|
|
b9a4805 |
-endif
|
|
|
b9a4805 |
-ifeq ($(ORAPATH),)
|
|
|
b9a4805 |
- ORAPATH=$(shell [ -f $(SYSBASE)/lib/oracle$(ORAVERDIR)/lib/libocci.so ] && \
|
|
|
b9a4805 |
- echo $(SYSBASE)/lib/oracle$(ORAVERDIR)/lib )
|
|
|
b9a4805 |
-endif
|
|
|
dd6e1a3 |
-
|
|
|
dd6e1a3 |
-ifneq ($(ORAPATH),)
|
|
|
dd6e1a3 |
- LIBS +=-L$(ORAPATH)
|
|
|
dd6e1a3 |
-endif
|
|
|
dd6e1a3 |
-
|
|
|
dd6e1a3 |
-LIBS +=-locci -lclntsh
|
|
|
dd6e1a3 |
-
|
|
|
dd6e1a3 |
-#DEFS +=-DLINUX -D_GNU_SOURCE -D_REENTRANT
|
|
|
dd6e1a3 |
-#LIBS +=-lpthread
|
|
|
dd6e1a3 |
-
|
|
|
dd6e1a3 |
-ifneq ($(ORAPATH),)
|
|
|
dd6e1a3 |
- LIBS +=-Wl,-rpath $(ORAPATH)
|
|
|
dd6e1a3 |
-endif
|
|
|
dd6e1a3 |
+DEFS +=-I$(ORAHOME)/include
|
|
|
dd6e1a3 |
+LIBS +=-L$(ORAHOME)/lib -locci -lclntsh
|
|
|
dd6e1a3 |
|
|
|
dd6e1a3 |
include ../../Makefile.rules
|
|
|
dd6e1a3 |
|