Attachment #450734 for bug #597520




MY_A_x86_sdk="${MY_A_x86/basic/sdk}"
MY_A_x86_odbc="${MY_A_x86/basic/odbc}"
MY_A_x86_jdbc="${MY_A_x86/basic/jdbc}"
MY_A_X86_precomp="${MY_A_x86/basic/precomp}"
MY_A_x86_sqlplus="${MY_A_x86/basic/sqlplus}"
MY_A_x86_tools="${MY_A_x86/basic/tools}"


MY_A_amd64_sdk="${MY_A_amd64/basic/sdk}"
MY_A_amd64_odbc="${MY_A_amd64/basic/odbc}"
MY_A_amd64_jdbc="${MY_A_amd64/basic/jdbc}"
MY_A_amd64_precomp="${MY_A_amd64/basic/precomp}"
MY_A_amd64_sqlplus="${MY_A_amd64/basic/sqlplus}"
MY_A_amd64_tools="${MY_A_amd64/basic/tools}"


		odbc? ( ${MY_A_x86_odbc} )
		jdbc? ( ${MY_A_x86_jdbc} )
		!abi_x86_64? (
			precomp? ( ${MY_A_X86_precomp} )
			sdk?     ( ${MY_A_x86_sdk}     )
			sqlplus? ( ${MY_A_x86_sqlplus} )
			tools?   ( ${MY_A_x86_tools}   )

		${MY_A_amd64}
		odbc?    ( ${MY_A_amd64_odbc}    )
		jdbc?    ( ${MY_A_amd64_jdbc}    )
		precomp? ( ${MY_A_amd64_precomp} )
		sdk?     ( ${MY_A_amd64_sdk}     )
		sqlplus? ( ${MY_A_amd64_sqlplus} )
		tools?   ( ${MY_A_amd64_tools}   )

SLOT="0/${MY_PVM}"
KEYWORDS="~amd64 ~x86"
RESTRICT="fetch splitdebug"
IUSE="jdbc odbc precomp +sdk +sqlplus tools"

REQUIRED_USE="precomp? ( sdk )"

DEPEND="app-arch/unzip"
RDEPEND="

	MY_A_sdk=MY_A_${abi}_sdk        ; MY_A_sdk=${!MY_A_sdk}         # sdk distfile
	MY_A_odbc=MY_A_${abi}_odbc      ; MY_A_odbc=${!MY_A_odbc}       # odbc distfile
	MY_A_jdbc=MY_A_${abi}_jdbc      ; MY_A_jdbc=${!MY_A_jdbc}       # jdbc distfile
	MY_A_precomp=MY_A_${abi}_precomp; MY_A_precomp=${!MY_A_precomp} # precomp distfile
	MY_A_sqlplus=MY_A_${abi}_sqlplus; MY_A_sqlplus=${!MY_A_sqlplus} # sqlplus distfile
	MY_A_tools=MY_A_${abi}_tools    ; MY_A_tools=${!MY_A_tools}     # tools distfile


		use jdbc &&
		eerror "     JDBC: ($(oic_distfile_status ${MY_A_jdbc})) ${MY_A_jdbc}"
		if multilib_is_native_abi; then
			use precomp &&
			eerror "  Precomp: ($(oic_distfile_status ${MY_A_precomp})) ${MY_A_precomp}"
			use sdk &&
			eerror "      SDK: ($(oic_distfile_status ${MY_A_sdk})) ${MY_A_sdk}"
			use sqlplus &&

		use odbc && unpack ${MY_A_odbc}
		use jdbc && unpack ${MY_A_jdbc}
		if multilib_is_native_abi; then
			use precomp && unpack ${MY_A_precomp}
			use sdk     && unpack ${MY_A_sdk}
			use sqlplus && unpack ${MY_A_sqlplus}
			use tools   && unpack ${MY_A_tools}


src_prepare() {
	use sdk && PATCHES=( "${FILESDIR}"/12.1.0.2-makefile.patch )
	use precomp && PATCHES+=( "${FILESDIR}"/12.1.0.2-precomp-gentoo.patch )

	if use precomp; then
		# Sanitize sys_include in precomp/admin/pcscfg.cfg
		local oracle_home=usr/$(get_libdir)/oracle/${MY_PVM}/client
		local sys_includes=${EROOT}${oracle_home}/include,${EROOT}usr/include
		sed -i -e 's%^sys_include=.*%sys_include=('${sys_includes}')%' precomp/admin/pcscfg.cfg || die
	fi

	default
}


	cd "${S}" || die
	eend $?

	if use precomp; then
		# Install pcscfg.cfg into /etc/oracle, as the user probably
		# wants to add the include path for the compiler headers
		# here and we do not want this to be overwritten.
		insinto /etc/oracle
		cd "${S}"/precomp/admin || die
		# Only install pcscfg.cfg, as the other file is for
		# the unsupported COBOL precompiler.
		doins pcscfg.cfg
		dosym /etc/oracle/pcscfg.cfg "/${oracle_home}"/precomp/admin/pcscfg.cfg

		cd "${S}"/sdk || die

		insinto "/${oracle_home}"/sdk/demo
		doins demo/demo_proc_ic.mk
		doins demo/procdemo.pc

		# Install into rdbms/public, as this is the
		# real directory, see SDK part.
		insinto "/${oracle_home}"/rdbms/public
		doins include/*.h

		# proc. procob and rtsora are skipped, as we do not support
		# COBOL right now (FIXME!)
		dobin proc
		dosym "/${oracle_home}"/bin/proc /usr/bin/proc

		cd "${S}" || die

		# COBOL interface is not installed
		#insinto "/${oracle_home}"
		#doins cobsqlintf.o
	fi

	if use sqlplus; then
		insinto "/${oracle_home}"/sqlplus/admin
		doins glogin.sql

	elog "to point to your user specific configuration."
	ewarn "Please re-source your shell settings for ORACLE_HOME"
	ewarn "  changes, such as: source /etc/profile"
	if use precomp; then
		ewarn ""
		ewarn "The proc precompiler uses the system library headers, which in"
		ewarn "turn include the headers of the used compiler."
		ewarn "To make proc work, please add the compiler header path of your"
		ewarn "preferred compiler to sys_include in:"
		ewarn "  ${EROOT}etc/oracle/pcscfg.cfg"
		ewarn "Remember to update this setting when you switch or update the"
		ewarn "compiler."
		ewarn "For gcc, the headers are usually found in a path matching the"
		ewarn "following pattern:"
		ewarn "  ${EROOT}usr/lib/gcc/*/*/include"
		ewarn "The exact details depend on the architecture and the version of"
		ewarn "the compiler to be used."
	fi
}

Return to bug 597520

Lines 14-19 Link Here

(-)dev-db/oracle-instantclient/oracle-instantclient-12.1.0.2.ebuild (-1 / +69 lines)
14	MY_A_x86_sdk="${MY_A_x86/basic/sdk}"	14	MY_A_x86_sdk="${MY_A_x86/basic/sdk}"
15	MY_A_x86_odbc="${MY_A_x86/basic/odbc}"	15	MY_A_x86_odbc="${MY_A_x86/basic/odbc}"
16	MY_A_x86_jdbc="${MY_A_x86/basic/jdbc}"	16	MY_A_x86_jdbc="${MY_A_x86/basic/jdbc}"
		17	MY_A_X86_precomp="${MY_A_x86/basic/precomp}"
17	MY_A_x86_sqlplus="${MY_A_x86/basic/sqlplus}"	18	MY_A_x86_sqlplus="${MY_A_x86/basic/sqlplus}"
18	MY_A_x86_tools="${MY_A_x86/basic/tools}"	19	MY_A_x86_tools="${MY_A_x86/basic/tools}"
19		20
Lines 23-28 Link Here
23	MY_A_amd64_sdk="${MY_A_amd64/basic/sdk}"	24	MY_A_amd64_sdk="${MY_A_amd64/basic/sdk}"
24	MY_A_amd64_odbc="${MY_A_amd64/basic/odbc}"	25	MY_A_amd64_odbc="${MY_A_amd64/basic/odbc}"
25	MY_A_amd64_jdbc="${MY_A_amd64/basic/jdbc}"	26	MY_A_amd64_jdbc="${MY_A_amd64/basic/jdbc}"
		27	MY_A_amd64_precomp="${MY_A_amd64/basic/precomp}"
26	MY_A_amd64_sqlplus="${MY_A_amd64/basic/sqlplus}"	28	MY_A_amd64_sqlplus="${MY_A_amd64/basic/sqlplus}"
27	MY_A_amd64_tools="${MY_A_amd64/basic/tools}"	29	MY_A_amd64_tools="${MY_A_amd64/basic/tools}"
28		30
Lines 34-39 Link Here
34	odbc? ( ${MY_A_x86_odbc} )	36	odbc? ( ${MY_A_x86_odbc} )
35	jdbc? ( ${MY_A_x86_jdbc} )	37	jdbc? ( ${MY_A_x86_jdbc} )
36	!abi_x86_64? (	38	!abi_x86_64? (
		39	precomp? ( ${MY_A_X86_precomp} )
37	sdk? ( ${MY_A_x86_sdk} )	40	sdk? ( ${MY_A_x86_sdk} )
38	sqlplus? ( ${MY_A_x86_sqlplus} )	41	sqlplus? ( ${MY_A_x86_sqlplus} )
39	tools? ( ${MY_A_x86_tools} )	42	tools? ( ${MY_A_x86_tools} )
Lines 42-47 Link Here
42	${MY_A_amd64}	45	${MY_A_amd64}
43	odbc? ( ${MY_A_amd64_odbc} )	46	odbc? ( ${MY_A_amd64_odbc} )
44	jdbc? ( ${MY_A_amd64_jdbc} )	47	jdbc? ( ${MY_A_amd64_jdbc} )
		48	precomp? ( ${MY_A_amd64_precomp} )
45	sdk? ( ${MY_A_amd64_sdk} )	49	sdk? ( ${MY_A_amd64_sdk} )
46	sqlplus? ( ${MY_A_amd64_sqlplus} )	50	sqlplus? ( ${MY_A_amd64_sqlplus} )
47	tools? ( ${MY_A_amd64_tools} )	51	tools? ( ${MY_A_amd64_tools} )
Lines 52-58 Link Here
52	SLOT="0/${MY_PVM}"	56	SLOT="0/${MY_PVM}"
53	KEYWORDS="~amd64 ~x86"	57	KEYWORDS="~amd64 ~x86"
54	RESTRICT="fetch splitdebug"	58	RESTRICT="fetch splitdebug"
55	IUSE="jdbc odbc +sdk +sqlplus tools"	59	IUSE="jdbc odbc precomp +sdk +sqlplus tools"
		60
		61	REQUIRED_USE="precomp? ( sdk )"
56		62
57	DEPEND="app-arch/unzip"	63	DEPEND="app-arch/unzip"
58	RDEPEND="	64	RDEPEND="
Lines 80-85 Link Here
80	MY_A_sdk=MY_A_${abi}_sdk ; MY_A_sdk=${!MY_A_sdk} # sdk distfile	86	MY_A_sdk=MY_A_${abi}_sdk ; MY_A_sdk=${!MY_A_sdk} # sdk distfile
81	MY_A_odbc=MY_A_${abi}_odbc ; MY_A_odbc=${!MY_A_odbc} # odbc distfile	87	MY_A_odbc=MY_A_${abi}_odbc ; MY_A_odbc=${!MY_A_odbc} # odbc distfile
82	MY_A_jdbc=MY_A_${abi}_jdbc ; MY_A_jdbc=${!MY_A_jdbc} # jdbc distfile	88	MY_A_jdbc=MY_A_${abi}_jdbc ; MY_A_jdbc=${!MY_A_jdbc} # jdbc distfile
		89	MY_A_precomp=MY_A_${abi}_precomp; MY_A_precomp=${!MY_A_precomp} # precomp distfile
83	MY_A_sqlplus=MY_A_${abi}_sqlplus; MY_A_sqlplus=${!MY_A_sqlplus} # sqlplus distfile	90	MY_A_sqlplus=MY_A_${abi}_sqlplus; MY_A_sqlplus=${!MY_A_sqlplus} # sqlplus distfile
84	MY_A_tools=MY_A_${abi}_tools ; MY_A_tools=${!MY_A_tools} # tools distfile	91	MY_A_tools=MY_A_${abi}_tools ; MY_A_tools=${!MY_A_tools} # tools distfile
85		92
Lines 109-114 Link Here
109	use jdbc &&	116	use jdbc &&
110	eerror " JDBC: ($(oic_distfile_status ${MY_A_jdbc})) ${MY_A_jdbc}"	117	eerror " JDBC: ($(oic_distfile_status ${MY_A_jdbc})) ${MY_A_jdbc}"
111	if multilib_is_native_abi; then	118	if multilib_is_native_abi; then
		119	use precomp &&
		120	eerror " Precomp: ($(oic_distfile_status ${MY_A_precomp})) ${MY_A_precomp}"
112	use sdk &&	121	use sdk &&
113	eerror " SDK: ($(oic_distfile_status ${MY_A_sdk})) ${MY_A_sdk}"	122	eerror " SDK: ($(oic_distfile_status ${MY_A_sdk})) ${MY_A_sdk}"
114	use sqlplus &&	123	use sqlplus &&
Lines 132-137 Link Here
132	use odbc && unpack ${MY_A_odbc}	141	use odbc && unpack ${MY_A_odbc}
133	use jdbc && unpack ${MY_A_jdbc}	142	use jdbc && unpack ${MY_A_jdbc}
134	if multilib_is_native_abi; then	143	if multilib_is_native_abi; then
		144	use precomp && unpack ${MY_A_precomp}
135	use sdk && unpack ${MY_A_sdk}	145	use sdk && unpack ${MY_A_sdk}
136	use sqlplus && unpack ${MY_A_sqlplus}	146	use sqlplus && unpack ${MY_A_sqlplus}
137	use tools && unpack ${MY_A_tools}	147	use tools && unpack ${MY_A_tools}
Lines 141-146 Link Here
141		151
142	src_prepare() {	152	src_prepare() {
143	use sdk && PATCHES=( "${FILESDIR}"/12.1.0.2-makefile.patch )	153	use sdk && PATCHES=( "${FILESDIR}"/12.1.0.2-makefile.patch )
		154	use precomp && PATCHES+=( "${FILESDIR}"/12.1.0.2-precomp-gentoo.patch )
		155
		156	if use precomp; then
		157	# Sanitize sys_include in precomp/admin/pcscfg.cfg
		158	local oracle_home=usr/$(get_libdir)/oracle/${MY_PVM}/client
		159	local sys_includes=${EROOT}${oracle_home}/include,${EROOT}usr/include
		160	sed -i -e 's%^sys_include=.*%sys_include=('${sys_includes}')%' precomp/admin/pcscfg.cfg \|\| die
		161	fi
		162
144	default	163	default
145	}	164	}
146		165
Lines 205-210 Link Here
205	cd "${S}" \|\| die	224	cd "${S}" \|\| die
206	eend $?	225	eend $?
207		226
		227	if use precomp; then
		228	# Install pcscfg.cfg into /etc/oracle, as the user probably
		229	# wants to add the include path for the compiler headers
		230	# here and we do not want this to be overwritten.
		231	insinto /etc/oracle
		232	cd "${S}"/precomp/admin \|\| die
		233	# Only install pcscfg.cfg, as the other file is for
		234	# the unsupported COBOL precompiler.
		235	doins pcscfg.cfg
		236	dosym /etc/oracle/pcscfg.cfg "/${oracle_home}"/precomp/admin/pcscfg.cfg
		237
		238	cd "${S}"/sdk \|\| die
		239
		240	insinto "/${oracle_home}"/sdk/demo
		241	doins demo/demo_proc_ic.mk
		242	doins demo/procdemo.pc
		243
		244	# Install into rdbms/public, as this is the
		245	# real directory, see SDK part.
		246	insinto "/${oracle_home}"/rdbms/public
		247	doins include/*.h
		248
		249	# proc. procob and rtsora are skipped, as we do not support
		250	# COBOL right now (FIXME!)
		251	dobin proc
		252	dosym "/${oracle_home}"/bin/proc /usr/bin/proc
		253
		254	cd "${S}" \|\| die
		255
		256	# COBOL interface is not installed
		257	#insinto "/${oracle_home}"
		258	#doins cobsqlintf.o
		259	fi
		260
208	if use sqlplus; then	261	if use sqlplus; then
209	insinto "/${oracle_home}"/sqlplus/admin	262	insinto "/${oracle_home}"/sqlplus/admin
210	doins glogin.sql	263	doins glogin.sql
Lines 301-304 Link Here
301	elog "to point to your user specific configuration."	354	elog "to point to your user specific configuration."
302	ewarn "Please re-source your shell settings for ORACLE_HOME"	355	ewarn "Please re-source your shell settings for ORACLE_HOME"
303	ewarn " changes, such as: source /etc/profile"	356	ewarn " changes, such as: source /etc/profile"
		357	if use precomp; then
		358	ewarn ""
		359	ewarn "The proc precompiler uses the system library headers, which in"
		360	ewarn "turn include the headers of the used compiler."
		361	ewarn "To make proc work, please add the compiler header path of your"
		362	ewarn "preferred compiler to sys_include in:"
		363	ewarn " ${EROOT}etc/oracle/pcscfg.cfg"
		364	ewarn "Remember to update this setting when you switch or update the"
		365	ewarn "compiler."
		366	ewarn "For gcc, the headers are usually found in a path matching the"
		367	ewarn "following pattern:"
		368	ewarn " ${EROOT}usr/lib/gcc///include"
		369	ewarn "The exact details depend on the architecture and the version of"
		370	ewarn "the compiler to be used."
		371	fi
304	}	372	}