From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5B57B138334 for ; Mon, 22 Oct 2018 12:24:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 64A83E0886; Mon, 22 Oct 2018 12:24:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 19327E0886 for ; Mon, 22 Oct 2018 12:24:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3BBA8335CCD for ; Mon, 22 Oct 2018 12:24:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4C8FA3F0 for ; Mon, 22 Oct 2018 12:24:42 +0000 (UTC) From: "Michael Haubenwallner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Haubenwallner" Message-ID: <1540210922.e1a42dfb7912831eb273d0356822b3870f5fdb7a.haubi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/oracle-instantclient/, dev-db/oracle-instantclient/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/oracle-instantclient/files/18.3.0.0-makefile.patch dev-db/oracle-instantclient/files/18.3.0.0-proc-makefile.patch dev-db/oracle-instantclient/oracle-instantclient-18.3.0.0-r1.ebuild X-VCS-Directories: dev-db/oracle-instantclient/files/ dev-db/oracle-instantclient/ X-VCS-Committer: haubi X-VCS-Committer-Name: Michael Haubenwallner X-VCS-Revision: e1a42dfb7912831eb273d0356822b3870f5fdb7a X-VCS-Branch: master Date: Mon, 22 Oct 2018 12:24:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 812bc058-6ec9-4ed4-b548-bfbfe485ac78 X-Archives-Hash: 7bfc9c6f196f9a10122d645a8201f32d commit: e1a42dfb7912831eb273d0356822b3870f5fdb7a Author: Michael Haubenwallner gentoo org> AuthorDate: Mon Oct 22 12:21:17 2018 +0000 Commit: Michael Haubenwallner gentoo org> CommitDate: Mon Oct 22 12:22:02 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1a42dfb dev-db/oracle-instantclient: fix precomp install With credits to Stefan Gast in bug#597520, tweak paths in demo_proc_ic.mk and pcscfg.cfg, move the latter to /etc/oracle/, and do not install the Pro*COBOL precompiler, but Pro*C only. Also, use relative paths for symlinks. Closes https://bugs.gentoo.org/597520 Package-Manager: Portage-2.3.49, Repoman-2.3.10 Signed-off-by: Michael Haubenwallner gentoo.org> .../files/18.3.0.0-makefile.patch | 2 +- .../files/18.3.0.0-proc-makefile.patch | 27 ++ .../oracle-instantclient-18.3.0.0-r1.ebuild | 375 +++++++++++++++++++++ 3 files changed, 403 insertions(+), 1 deletion(-) diff --git a/dev-db/oracle-instantclient/files/18.3.0.0-makefile.patch b/dev-db/oracle-instantclient/files/18.3.0.0-makefile.patch index eb6fc025d78..bc4445fe354 100644 --- a/dev-db/oracle-instantclient/files/18.3.0.0-makefile.patch +++ b/dev-db/oracle-instantclient/files/18.3.0.0-makefile.patch @@ -14,7 +14,7 @@ This provides absolute paths for headers and libraries. +else +LIBDIR=lib +endif -+ICINCHOME=$(ORACLE_HOME)/sdk/include ++ICINCHOME=$(ORACLE_HOME)/include +ICLIBHOME=$(ORACLE_HOME)/$(LIBDIR) ICLIBPATH=-L$(ICLIBHOME) THREADLIBS=-lthread diff --git a/dev-db/oracle-instantclient/files/18.3.0.0-proc-makefile.patch b/dev-db/oracle-instantclient/files/18.3.0.0-proc-makefile.patch new file mode 100644 index 00000000000..a197c2c7236 --- /dev/null +++ b/dev-db/oracle-instantclient/files/18.3.0.0-proc-makefile.patch @@ -0,0 +1,27 @@ +--- instantclient_18_3/sdk/demo/demo_proc_ic.mk.orig 2018-10-22 13:34:44.302293002 +0200 ++++ instantclient_18_3/sdk/demo/demo_proc_ic.mk 2018-10-22 13:38:55.015321571 +0200 +@@ -37,8 +37,13 @@ + cc=/usr/bin/gcc + + # InstantClient Directories. +-ICSDKHOME=../ +-ICLIBHOME=../../ ++ifeq ($(BUILD32),T) ++LIBDIR=lib32 ++else ++LIBDIR=lib ++endif ++ICSDKHOME=$(ORACLE_HOME)/ ++ICLIBHOME=$(ORACLE_HOME)/$(LIBDIR) + + MKLINK=ln + REMOVE=rm -rf +@@ -48,7 +53,7 @@ + MAKEFILE=demo_proc_ic.mk + PROCDEMO=procdemo + +-PROC=$(ICSDKHOME)proc ++PROC=$(ICSDKHOME)bin/proc + SO_EXT=.so + I_SYM=-I + diff --git a/dev-db/oracle-instantclient/oracle-instantclient-18.3.0.0-r1.ebuild b/dev-db/oracle-instantclient/oracle-instantclient-18.3.0.0-r1.ebuild new file mode 100644 index 00000000000..160831003b5 --- /dev/null +++ b/dev-db/oracle-instantclient/oracle-instantclient-18.3.0.0-r1.ebuild @@ -0,0 +1,375 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit eutils pax-utils multilib-minimal + +DESCRIPTION="Oracle 18c Instant Client with SDK" +HOMEPAGE="https://www.oracle.com/technetwork/database/database-technologies/instant-client/overview/index.html" + +MY_SOVER=18.1 # the library soname found in the zip files + +IUSE="jdbc odbc precomp +sdk +sqlplus tools" +REQUIRED_USE="precomp? ( sdk )" + +MY_PVM=$(ver_cut 1-2) +MY_P="instantclient_$(ver_rs 1 _ ${MY_PVM})" + +MY_PV=$(ver_cut 1-4) +MY_PVP=$(ver_cut 5) # p2 + +MY_PLAT_x86="Linux x86" +MY_BITS_x86=32 +MY_A_x86="${PN/oracle-/}-basic-linux-${MY_PV}.0dbru.zip" +MY_A_x86_jdbc="${MY_A_x86/basic/jdbc}" +MY_A_x86_odbc="${MY_A_x86/basic/odbc}" +MY_A_x86_precomp="${MY_A_x86/basic/precomp}" +MY_A_x86_sdk="${MY_A_x86/basic/sdk}" +MY_A_x86_sqlplus="${MY_A_x86/basic/sqlplus}" +MY_A_x86_tools="${MY_A_x86/basic/tools}" + +MY_PLAT_amd64="Linux x86-64" +MY_BITS_amd64=64 +MY_A_amd64="${PN/oracle-}-basic-linux.x64-${MY_PV}.0dbru.zip" +MY_A_amd64_jdbc="${MY_A_amd64/basic/jdbc}" +MY_A_amd64_odbc="${MY_A_amd64/basic/odbc}" +MY_A_amd64_precomp="${MY_A_amd64/basic/precomp}" +MY_A_amd64_sdk="${MY_A_amd64/basic/sdk}" +MY_A_amd64_sqlplus="${MY_A_amd64/basic/sqlplus}" +MY_A_amd64_tools="${MY_A_amd64/basic/tools}" + +if [[ ${MY_PVP} == p* ]] +then + MY_PVP=-${MY_PVP#p} + # Updated 9/22/2017: instantclient-odbc-linux-12.2.0.1.0-2.zip + MY_A_x86_odbc="${MY_A_x86_odbc%.zip}${MY_PVP}.zip" + MY_A_amd64_odbc="${MY_A_amd64_odbc%.zip}${MY_PVP}.zip" +fi + +SRC_URI=" + abi_x86_32? ( + ${MY_A_x86} + jdbc? ( ${MY_A_x86_jdbc} ) + odbc? ( ${MY_A_x86_odbc} ) + precomp? ( ${MY_A_x86_precomp} ) + !abi_x86_64? ( + sdk? ( ${MY_A_x86_sdk} ) + sqlplus? ( ${MY_A_x86_sqlplus} ) + tools? ( ${MY_A_x86_tools} ) + ) ) + abi_x86_64? ( + ${MY_A_amd64} + jdbc? ( ${MY_A_amd64_jdbc} ) + odbc? ( ${MY_A_amd64_odbc} ) + precomp? ( ${MY_A_amd64_precomp} ) + sdk? ( ${MY_A_amd64_sdk} ) + sqlplus? ( ${MY_A_amd64_sqlplus} ) + tools? ( ${MY_A_amd64_tools} ) + ) +" + +LICENSE="OTN" +SLOT="0/${MY_SOVER}" +KEYWORDS="~amd64 ~x86" +RESTRICT="fetch splitdebug" + +DEPEND="app-arch/unzip" +RDEPEND=" + >=dev-libs/libaio-0.3.109-r5[${MULTILIB_USEDEP}] + !/dev/null || die + pax-mark -c ${paxbins[*]#*/} || die + popd >/dev/null || die + eend $? + + einstalldocs + + # create path for tnsnames.ora + insinto /etc/oracle + doins "${FILESDIR}"/tnsnames.ora.sample + + # Add OCI libs to library path + { + echo "# ${EPREFIX}/etc/env.d/50${PN}" + echo "# Do not edit this file, but 99${PN} instead" + echo + echo "ORACLE_HOME=${EPREFIX}${oracle_home}" + echo "LDPATH=${ldpath}" + echo "TNS_ADMIN=${EPREFIX}/etc/oracle/" + } > "${T}"/50${PN} + + doenvd "${T}"/50${PN} + + # ensure ORACLE_HOME/lib exists + [[ -e ${ED}${oracle_home}/lib/. ]] || + dosym $(get_libdir) "${oracle_home#/}"/lib +} + +pkg_preinst() { + if [[ -r ${EROOT}/etc/env.d/99${PN} ]]; then + cp "${EROOT}/etc/env.d/99${PN}" "${ED}/etc/env.d/" || die + else + { + echo "# ${EPREFIX}/etc/env.d/99${PN}" + echo "# Configure system-wide defaults for your Oracle Instant Client here" + echo + echo "#$(grep '^ORACLE_HOME=' "${ED}/etc/env.d/50${PN}")" + echo "#$(grep '^TNS_ADMIN=' "${ED}/etc/env.d/50${PN}")" + echo "#NLS_LANG=" + } > "${ED}/etc/env.d/99${PN}" + fi +} + +pkg_postinst() { + elog "${P} does not provide an sqlnet.ora" + elog "configuration file, redirecting oracle diagnostics for database-" + elog "and network-issues into ~USER/oradiag_USER/ instead." + elog "It should be safe to ignore this message in sqlnet.log there:" + elog " Directory does not exist for read/write [ORACLE_HOME/client/log] []" + elog "See https://bugs.gentoo.org/show_bug.cgi?id=465252 for reference." + elog "If you want to directly analyse low-level debug info or don't want" + elog "to see it at all, so you really need an sqlnet.ora file, please" + elog "consult http://search.oracle.com/search/search?q=sqlnet.ora" + elog "" + elog "TNS_ADMIN has been set to ${EPREFIX}/etc/oracle by default," + elog "put your tnsnames.ora there or configure TNS_ADMIN" + elog "to point to your user specific configuration." + if use precomp; then + elog "" + elog "The proc precompiler uses the system library headers, which in" + elog "turn include the headers of the used compiler." + elog "To make proc work, please add the compiler header path of your" + elog "preferred compiler to sys_include in:" + elog " ${EPREFIX}/etc/oracle/pcscfg.cfg" + elog "Remember to update this setting when you switch or update the" + elog "compiler." + elog "For gcc, the headers are usually found in a path matching the" + elog "following pattern:" + elog " ${EPREFIX}/usr/lib/gcc/*/*/include" + elog "The exact details depend on the architecture and the version of" + elog "the compiler to be used." + fi + ewarn "Please re-source your shell settings for ORACLE_HOME" + ewarn " changes, such as: source ${EPREFIX}/etc/profile" +}