[patch] 12.1.0.2-makefile.patch

12.1.0.2-makefile.patch (text/plain), 2.14 KB, created by Sergey S. Starikoff on 2014-10-10 06:54:17 UTC

diff -Naur instantclient_12_1.orig/sdk/demo/demo.mk instantclient_12_1/sdk/demo/demo.mk
--- instantclient_12_1.orig/sdk/demo/demo.mk	2014-10-10 10:15:12.000000000 +0400
+++ instantclient_12_1/sdk/demo/demo.mk	2014-10-10 10:19:19.000000000 +0400
@@ -28,8 +28,9 @@
 CC=/opt/SunProd/SUNWspro6.1/bin/CC
 cc=/opt/SunProd/SUNWspro6.1/bin/cc
 
-ICINCHOME=../
-ICLIBHOME=../../
+LIBDIR=lib
+ICINCHOME=$(ORACLE_HOME)/
+ICLIBHOME=$(ORACLE_HOME)/$(LIBDIR)
 ICLIBPATH=-L$(ICLIBHOME)
 THREADLIBS=-lthread
 CCLIB=$(ICLIBPATH) -locci -lclntsh $(THREADLIBS)
@@ -64,18 +65,18 @@
 all: clean buildoci $(OCCIDEMO) $(OCCIOBJDEMO)
 
 buildoci: $(CLNCACHE) $(LIBCLNT) $(CDEMOOBJS)
-	$(MKLINK) $(ICLIBHOME)libclntsh$(SO_EXT).12.1 $(ICLIBHOME)libclntsh$(SO_EXT)
-	$(MKLINK) $(ICLIBHOME)libocci$(SO_EXT).12.1 $(ICLIBHOME)libocci$(SO_EXT)
+	#$(MKLINK) $(ICLIBHOME)libclntsh$(SO_EXT).12.1 $(ICLIBHOME)libclntsh$(SO_EXT)
+	#$(MKLINK) $(ICLIBHOME)libocci$(SO_EXT).12.1 $(ICLIBHOME)libocci$(SO_EXT)
 	$(CC) -o $(CDEMOEXE) $(LDFLAGS) $(CDEMOOBJS) $(CCLIB)
-	$(REMOVE) $(ICLIBHOME)libclntsh$(SO_EXT)
-	$(REMOVE) $(ICLIBHOME)libocci$(SO_EXT)
+	#$(REMOVE) $(ICLIBHOME)libclntsh$(SO_EXT)
+	#$(REMOVE) $(ICLIBHOME)libocci$(SO_EXT)
 
 buildocci: $(CLNCACHE) $(LIBCLNT) $(OBJS)
-	$(MKLINK) $(ICLIBHOME)libclntsh$(SO_EXT).12.1 $(ICLIBHOME)libclntsh$(SO_EXT)
-	$(MKLINK) $(ICLIBHOME)libocci$(SO_EXT).12.1 $(ICLIBHOME)libocci$(SO_EXT)
+	#$(MKLINK) $(ICLIBHOME)libclntsh$(SO_EXT).12.1 $(ICLIBHOME)libclntsh$(SO_EXT)
+	#$(MKLINK) $(ICLIBHOME)libocci$(SO_EXT).12.1 $(ICLIBHOME)libocci$(SO_EXT)
 	$(CC) -o $(EXE) $(LDFLAGS) $(OBJS) $(CCLIB)
-	$(REMOVE) $(ICLIBHOME)libclntsh$(SO_EXT)
-	$(REMOVE) $(ICLIBHOME)libocci$(SO_EXT)
+	#$(REMOVE) $(ICLIBHOME)libclntsh$(SO_EXT)
+	#$(REMOVE) $(ICLIBHOME)libocci$(SO_EXT)
 
 $(OCCIDEMO):
 	$(MAKE) -f $(MAKEFILE) buildocci OBJS=$@.o EXE=$@
@@ -93,8 +94,8 @@
 
 cleancache:
 	$(REMOVE) $(CACHEDIR)
-	$(REMOVE) $(ICLIBHOME)libclntsh$(SO_EXT)
-	$(REMOVE) $(ICLIBHOME)libocci$(SO_EXT)
+	#$(REMOVE) $(ICLIBHOME)libclntsh$(SO_EXT)
+	#$(REMOVE) $(ICLIBHOME)libocci$(SO_EXT)
 
 clean: $(CLNCACHE)
 	$(REMOVE) cdemo81 cdemo81.o occidml occidml.o occiobj occiobj.o occiobjo* occiobjm* occiobj.h occiobjout.type