diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
| commit | 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch) | |
| tree | 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /dev-db/oracle-instantclient/files/12.1.0.2-makefile.patch | |
| parent | 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff) | |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-db/oracle-instantclient/files/12.1.0.2-makefile.patch')
| -rw-r--r-- | dev-db/oracle-instantclient/files/12.1.0.2-makefile.patch | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/dev-db/oracle-instantclient/files/12.1.0.2-makefile.patch b/dev-db/oracle-instantclient/files/12.1.0.2-makefile.patch new file mode 100644 index 000000000000..999d8c35f0d6 --- /dev/null +++ b/dev-db/oracle-instantclient/files/12.1.0.2-makefile.patch @@ -0,0 +1,57 @@ +Fake demo_xe.mk found in Oracle eXpress Edition, +known by CPAN DBD::Oracle (bug#165834). +This provides absolute paths for headers and libraries. + +Paranoia drops those REMOVE lines. +--- instantclient_12_1/sdk/demo/demo.mk ++++ instantclient_12_1/sdk/demo/demo.mk +@@ -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 |