From: "Michal Gorny (mgorny)" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog autotools-multilib.eclass
Date: Mon, 1 Apr 2013 09:18:58 +0000 (UTC) [thread overview]
Message-ID: <20130401091858.0F4042171D@flycatcher.gentoo.org> (raw)
mgorny 13/04/01 09:18:57
Modified: ChangeLog autotools-multilib.eclass
Log:
Support wrapping headers for multilib.
Revision Changes Path
1.763 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.763&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.763&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.762&r2=1.763
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.762
retrieving revision 1.763
diff -u -r1.762 -r1.763
--- ChangeLog 1 Apr 2013 09:17:53 -0000 1.762
+++ ChangeLog 1 Apr 2013 09:18:57 -0000 1.763
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.762 2013/04/01 09:17:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.763 2013/04/01 09:18:57 mgorny Exp $
+
+ 01 Apr 2013; Michał Górny <mgorny@gentoo.org> autotools-multilib.eclass:
+ Support wrapping headers for multilib.
01 Apr 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass,
multibuild.eclass:
1.13 eclass/autotools-multilib.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-multilib.eclass?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-multilib.eclass?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-multilib.eclass?r1=1.12&r2=1.13
Index: autotools-multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-multilib.eclass,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- autotools-multilib.eclass 27 Feb 2013 21:47:38 -0000 1.12
+++ autotools-multilib.eclass 1 Apr 2013 09:18:57 -0000 1.13
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-multilib.eclass,v 1.12 2013/02/27 21:47:38 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-multilib.eclass,v 1.13 2013/04/01 09:18:57 mgorny Exp $
# @ECLASS: autotools-multilib.eclass
# @MAINTAINER:
@@ -33,6 +33,28 @@
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 (${ED}), 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,84 @@
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
+
+ if [[ ! -f ${ED}/tmp/multilib-include/${f} ]]; then
+ dodir "/tmp/multilib-include/${dir}"
+ # a generic template
+ 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 defined(__x86_64__) /* amd64 */
+# if defined(__ILP32__) /* x32 ABI */
+# error "abi_x86_x32 not supported by the package."
+# else /* 64-bit ABI */
+# error "abi_x86_64 not supported by the package."
+# endif
+#elif defined(__i386__) /* plain x86 */
+# error "abi_x86_32 not supported by the package."
+#else
+# error "No ABI matched, please report a bug to bugs.gentoo.org"
+#endif
+_EOF_
+ fi
+
+ # XXX: get abi_* directly
+ local abi_flag
+ case "${ABI}" in
+ amd64)
+ abi_flag=abi_x86_64;;
+ x86)
+ abi_flag=abi_x86_32;;
+ x32)
+ abi_flag=abi_x86_x32;;
+ *)
+ die "Header wrapping for ${ABI} not supported yet";;
+ esac
+
+ # Note: match a space afterwards to avoid collision potential.
+ sed -e "/${abi_flag} /s&error.*&include <${CHOST}/${f}>&" \
+ -i "${ED}/tmp/multilib-include/${f}" || die
+ 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
}
next reply other threads:[~2013-04-01 9:19 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-01 9:18 Michal Gorny (mgorny) [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-04-30 18:17 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog autotools-multilib.eclass Michal Gorny (mgorny)
2014-01-15 12:12 Michal Gorny (mgorny)
2013-11-24 10:53 Michal Gorny (mgorny)
2013-11-24 10:25 Michal Gorny (mgorny)
2013-04-01 11:05 Michal Gorny (mgorny)
2013-02-27 21:47 Michal Gorny (mgorny)
2013-02-27 21:46 Michal Gorny (mgorny)
2013-02-22 14:42 Michal Gorny (mgorny)
2013-01-26 11:39 Michal Gorny (mgorny)
2013-01-26 11:38 Michal Gorny (mgorny)
2013-01-26 11:35 Michal Gorny (mgorny)
2013-01-26 11:34 Michal Gorny (mgorny)
2013-01-20 23:42 Michal Gorny (mgorny)
2012-10-08 18:44 Michal Gorny (mgorny)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130401091858.0F4042171D@flycatcher.gentoo.org \
--to=mgorny@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox