From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B95B8198005 for ; Sat, 23 Mar 2013 19:55:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5EDEAE0667; Sat, 23 Mar 2013 19:55:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6A49EE05FC for ; Sat, 23 Mar 2013 19:55:19 +0000 (UTC) Received: from pomiocik.lan (unknown [83.238.59.230]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: mgorny) by smtp.gentoo.org (Postfix) with ESMTPSA id 9769E33BE40; Sat, 23 Mar 2013 19:55:17 +0000 (UTC) From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= To: gentoo-dev@lists.gentoo.org Cc: flameeyes@gentoo.org, =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Subject: [gentoo-dev] [PATCH] Support wrapping headers for multilib ABIs. Date: Sat, 23 Mar 2013 20:56:03 +0100 Message-Id: <1364068563-4230-1-git-send-email-mgorny@gentoo.org> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <514DDC5A.5040308@flameeyes.eu> References: <514DDC5A.5040308@flameeyes.eu> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Archives-Salt: b8b52641-b24d-42e7-ab17-364b890f19fe X-Archives-Hash: 5523829f97df92061f7f015eaed92f01 --- gx86/eclass/autotools-multilib.eclass | 86 +++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/gx86/eclass/autotools-multilib.eclass b/gx86/eclass/autotools-multilib.eclass index d7372b0..e96fdaf 100644 --- a/gx86/eclass/autotools-multilib.eclass +++ b/gx86/eclass/autotools-multilib.eclass @@ -33,6 +33,28 @@ inherit autotools-utils multilib-build EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install +# @ECLASS-VARIABLE: MULTILIB_WRAPPED_HEADERS +# @DESCRIPTION: +# A list of headers to wrap for multilib support. The listed headers +# will be moved to a non-standard location and replace with a file +# including them conditionally to current ABI. +# +# This variable has to be a bash array. Paths shall be relative to +# installation root (${D}), and name regular files. Recursive wrapping +# is not supported. +# +# Please note that header wrapping is *discouraged*. It is preferred to +# install all headers in a subdirectory of libdir and use pkg-config to +# locate the headers. Some C preprocessors will not work with wrapped +# headers. +# +# Example: +# @CODE +# MULTILIB_WRAPPED_HEADERS=( +# /usr/include/foobar/config.h +# ) +# @CODE + autotools-multilib_src_prepare() { autotools-utils_src_prepare "${@}" } @@ -49,13 +71,77 @@ autotools-multilib_src_test() { multilib_foreach_abi autotools-utils_src_test "${@}" } +_autotools-multilib_wrap_headers() { + debug-print-function ${FUNCNAME} "$@" + local f + + for f in "${MULTILIB_WRAPPED_HEADERS[@]}"; do + # drop leading slash if it's there + f=${f#/} + + if [[ ${f} != usr/include/* ]]; then + die "Wrapping headers outside of /usr/include is not supported at the moment." + fi + # and then usr/include + f=${f#usr/include/} + + local dir=${f%/*} + + # $CHOST shall be set by multilib_toolchain_setup + dodir "/tmp/multilib-include/${CHOST}/${dir}" + mv "${ED}/usr/include/${f}" "${ED}/tmp/multilib-include/${CHOST}/${dir}/" || die + + local defs + case "${ABI}" in + amd64) + defs='defined(__x86_64__) && !defined(__ILP32__)';; + x86) + defs='defined(__i386__)';; + x32) + defs='defined(__x86_64__) && defined(__ILP32__)';; + *) + die "Header wrapping for ${ABI} not supported yet";; + esac + + if [[ ! -f ${ED}/tmp/multilib-include/${f} ]]; then + dodir "/tmp/multilib-include/${dir}" + cat > "${ED}/tmp/multilib-include/${f}" <<_EOF_ || die +/* This file is auto-generated by autotools-multilib.eclass + * as a multilib-friendly wrapper. For the original content, + * please see the files that are #included below. + */ + +#if ${defs} +# include <${CHOST}/${f}> +#else +# error "No ABI matched, please report a bug to bugs.gentoo.org" +#endif +_EOF_ + else + sed -e "/^#else/i\ +#elif ${defs}\n\ +# include <${CHOST}/${f}>" \ + -i "${ED}/tmp/multilib-include/${f}" || die + fi + done +} + autotools-multilib_src_install() { autotools-multilib_secure_install() { autotools-utils_src_install "${@}" + _autotools-multilib_wrap_headers # Make sure all headers are the same for each ABI. multilib_check_headers } multilib_foreach_abi autotools-multilib_secure_install "${@}" + + # merge the wrapped headers + if [[ -d "${ED}"/tmp/multilib-include ]]; then + multibuild_merge_root \ + "${ED}"/tmp/multilib-include "${ED}"/usr/include + # it can fail if something else uses /tmp + rmdir "${ED}"/tmp &>/dev/null + fi } -- 1.8.1.5