| 1 |
commit: f76b5b4746403b8e673f440ef70c2031696694ef |
| 2 |
Author: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Sep 12 09:02:42 2019 +0000 |
| 4 |
Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Apr 23 06:45:46 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f76b5b47 |
| 7 |
|
| 8 |
dev-db/opendbx: properly locate oracle sdk |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/505346 |
| 11 |
Package-Manager: Portage-2.3.69, Repoman-2.3.16 |
| 12 |
Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-db/opendbx/opendbx-1.4.5-r1.ebuild | 16 +++++++++++++++- |
| 15 |
dev-db/opendbx/opendbx-1.4.6-r2.ebuild | 16 +++++++++++++++- |
| 16 |
dev-db/opendbx/opendbx-1.4.6-r3.ebuild | 16 +++++++++++++++- |
| 17 |
dev-db/opendbx/opendbx-1.5.0-r2.ebuild | 16 +++++++++++++++- |
| 18 |
4 files changed, 60 insertions(+), 4 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-db/opendbx/opendbx-1.4.5-r1.ebuild b/dev-db/opendbx/opendbx-1.4.5-r1.ebuild |
| 21 |
index 6def19a1ee0..222716f22f7 100644 |
| 22 |
--- a/dev-db/opendbx/opendbx-1.4.5-r1.ebuild |
| 23 |
+++ b/dev-db/opendbx/opendbx-1.4.5-r1.ebuild |
| 24 |
@@ -44,7 +44,21 @@ src_configure() { |
| 25 |
|
| 26 |
use mysql && append-cppflags -I/usr/include/mysql |
| 27 |
use firebird && append-cppflags -I/opt/firebird/include |
| 28 |
- use oracle && append-ldflags -L"${ORACLE_HOME}"/lib |
| 29 |
+ |
| 30 |
+ if use oracle ; then |
| 31 |
+ # Traditionally, OCI header files are provided in: |
| 32 |
+ append-cppflags -I"${ORACLE_HOME}"/rdbms/public |
| 33 |
+ # But newer versions merged them with additional SDKs: |
| 34 |
+ append-cppflags -I"${ORACLE_HOME}"/sdk/include |
| 35 |
+ # Depending on the client package ORACLE_HOME refers to, |
| 36 |
+ # we need to find the libraries in varying locations: |
| 37 |
+ # - gentoo instantclient has multilib (dev-db/oracle-instantclient) |
| 38 |
+ append-ldflags -L"${ORACLE_HOME}"/$(get_libdir) |
| 39 |
+ # - vanilla full client lacks multilib (LINUX*_client{,_home}.zip) |
| 40 |
+ append-ldflags -L"${ORACLE_HOME}"/lib |
| 41 |
+ # - vanilla instantclient lacks libdir (instantclient-*.zip) |
| 42 |
+ append-ldflags -L"${ORACLE_HOME}" |
| 43 |
+ fi |
| 44 |
|
| 45 |
econf --with-backends="${backends}" |
| 46 |
} |
| 47 |
|
| 48 |
diff --git a/dev-db/opendbx/opendbx-1.4.6-r2.ebuild b/dev-db/opendbx/opendbx-1.4.6-r2.ebuild |
| 49 |
index f3c0607e740..5c3009011be 100644 |
| 50 |
--- a/dev-db/opendbx/opendbx-1.4.6-r2.ebuild |
| 51 |
+++ b/dev-db/opendbx/opendbx-1.4.6-r2.ebuild |
| 52 |
@@ -44,7 +44,21 @@ src_configure() { |
| 53 |
|
| 54 |
use mysql && append-cppflags -I/usr/include/mysql |
| 55 |
use firebird && append-cppflags -I/opt/firebird/include |
| 56 |
- use oracle && append-ldflags -L"${ORACLE_HOME}"/lib |
| 57 |
+ |
| 58 |
+ if use oracle ; then |
| 59 |
+ # Traditionally, OCI header files are provided in: |
| 60 |
+ append-cppflags -I"${ORACLE_HOME}"/rdbms/public |
| 61 |
+ # But newer versions merged them with additional SDKs: |
| 62 |
+ append-cppflags -I"${ORACLE_HOME}"/sdk/include |
| 63 |
+ # Depending on the client package ORACLE_HOME refers to, |
| 64 |
+ # we need to find the libraries in varying locations: |
| 65 |
+ # - gentoo instantclient has multilib (dev-db/oracle-instantclient) |
| 66 |
+ append-ldflags -L"${ORACLE_HOME}"/$(get_libdir) |
| 67 |
+ # - vanilla full client lacks multilib (LINUX*_client{,_home}.zip) |
| 68 |
+ append-ldflags -L"${ORACLE_HOME}"/lib |
| 69 |
+ # - vanilla instantclient lacks libdir (instantclient-*.zip) |
| 70 |
+ append-ldflags -L"${ORACLE_HOME}" |
| 71 |
+ fi |
| 72 |
|
| 73 |
econf --with-backends="${backends}" |
| 74 |
} |
| 75 |
|
| 76 |
diff --git a/dev-db/opendbx/opendbx-1.4.6-r3.ebuild b/dev-db/opendbx/opendbx-1.4.6-r3.ebuild |
| 77 |
index daae3dd90bd..7bdd9b3e613 100644 |
| 78 |
--- a/dev-db/opendbx/opendbx-1.4.6-r3.ebuild |
| 79 |
+++ b/dev-db/opendbx/opendbx-1.4.6-r3.ebuild |
| 80 |
@@ -52,7 +52,21 @@ src_configure() { |
| 81 |
|
| 82 |
use mysql && append-cppflags -I/usr/include/mysql |
| 83 |
use firebird && append-cppflags -I/opt/firebird/include |
| 84 |
- use oracle && append-ldflags -L"${ORACLE_HOME}"/lib |
| 85 |
+ |
| 86 |
+ if use oracle ; then |
| 87 |
+ # Traditionally, OCI header files are provided in: |
| 88 |
+ append-cppflags -I"${ORACLE_HOME}"/rdbms/public |
| 89 |
+ # But newer versions merged them with additional SDKs: |
| 90 |
+ append-cppflags -I"${ORACLE_HOME}"/sdk/include |
| 91 |
+ # Depending on the client package ORACLE_HOME refers to, |
| 92 |
+ # we need to find the libraries in varying locations: |
| 93 |
+ # - gentoo instantclient has multilib (dev-db/oracle-instantclient) |
| 94 |
+ append-ldflags -L"${ORACLE_HOME}"/$(get_libdir) |
| 95 |
+ # - vanilla full client lacks multilib (LINUX*_client{,_home}.zip) |
| 96 |
+ append-ldflags -L"${ORACLE_HOME}"/lib |
| 97 |
+ # - vanilla instantclient lacks libdir (instantclient-*.zip) |
| 98 |
+ append-ldflags -L"${ORACLE_HOME}" |
| 99 |
+ fi |
| 100 |
|
| 101 |
econf --with-backends="${backends}" --enable-manpages="$(usex man yes no)" |
| 102 |
} |
| 103 |
|
| 104 |
diff --git a/dev-db/opendbx/opendbx-1.5.0-r2.ebuild b/dev-db/opendbx/opendbx-1.5.0-r2.ebuild |
| 105 |
index 9f23d103a95..75d65ca1fe3 100644 |
| 106 |
--- a/dev-db/opendbx/opendbx-1.5.0-r2.ebuild |
| 107 |
+++ b/dev-db/opendbx/opendbx-1.5.0-r2.ebuild |
| 108 |
@@ -49,7 +49,21 @@ src_configure() { |
| 109 |
|
| 110 |
use mysql && append-cppflags -I/usr/include/mysql |
| 111 |
use firebird && append-cppflags -I/opt/firebird/include |
| 112 |
- use oracle && append-ldflags -L"${ORACLE_HOME}"/lib |
| 113 |
+ |
| 114 |
+ if use oracle ; then |
| 115 |
+ # Traditionally, OCI header files are provided in: |
| 116 |
+ append-cppflags -I"${ORACLE_HOME}"/rdbms/public |
| 117 |
+ # But newer versions merged them with additional SDKs: |
| 118 |
+ append-cppflags -I"${ORACLE_HOME}"/sdk/include |
| 119 |
+ # Depending on the client package ORACLE_HOME refers to, |
| 120 |
+ # we need to find the libraries in varying locations: |
| 121 |
+ # - gentoo instantclient has multilib (dev-db/oracle-instantclient) |
| 122 |
+ append-ldflags -L"${ORACLE_HOME}"/$(get_libdir) |
| 123 |
+ # - vanilla full client lacks multilib (LINUX*_client{,_home}.zip) |
| 124 |
+ append-ldflags -L"${ORACLE_HOME}"/lib |
| 125 |
+ # - vanilla instantclient lacks libdir (instantclient-*.zip) |
| 126 |
+ append-ldflags -L"${ORACLE_HOME}" |
| 127 |
+ fi |
| 128 |
|
| 129 |
econf --with-backends="${backends}" |
| 130 |
} |
Archives