From: Matthias Klose <doko@ubuntu.com>
To: "libstdc++@gcc.gnu.org" <libstdc++@gcc.gnu.org>
Cc: gcc-patches@gcc.gnu.org
Subject: [patch] install host specific {bits,ext}/opt_random.h headers in host specific c++ incdir
Date: Sun, 12 May 2013 09:58:00 -0000 [thread overview]
Message-ID: <518F67BF.8090500@ubuntu.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 214 bytes --]
{bits,ext}/opt_random.h became host specific in 4.8, but are still installed
into the host independent c++ include dir. install them into the host specific
include dir instead. Ok for 4.8 and trunk?
Matthias
[-- Attachment #2: host-headers.diff --]
[-- Type: text/plain, Size: 2831 bytes --]
2013-05-11 Matthias Klose <doko@ubuntu.com>
* include/Makefile.am (bits_headers): Remove ${bits_host_headers}.
(ext_headers): Remove ${ext_host_headers}.
(stamp-${host_alias}): Create ${host_builddir}/../ext.
(stamp-host): Link ${bits_host_headers} and ${ext_host_headers}.
(install-headers): Install ${bits_host_headers} and ${ext_host_headers}.
* include/Makefile.in: Regenerate.
--- libstdc++-v3/include/Makefile.am (revision 198799)
+++ libstdc++-v3/include/Makefile.am (working copy)
@@ -172,8 +172,7 @@
${bits_srcdir}/valarray_array.tcc \
${bits_srcdir}/valarray_before.h \
${bits_srcdir}/valarray_after.h \
- ${bits_srcdir}/vector.tcc \
- ${bits_host_headers}
+ ${bits_srcdir}/vector.tcc
bits_host_headers = \
${glibcxx_srcdir}/${CPU_OPT_BITS_RANDOM}
@@ -535,8 +534,7 @@
${ext_srcdir}/vstring.tcc \
${ext_srcdir}/vstring_fwd.h \
${ext_srcdir}/vstring_util.h \
- ${ext_compat_headers} \
- ${ext_host_headers}
+ ${ext_compat_headers}
ext_compat_headers = \
${backward_srcdir}/hash_set \
@@ -1048,13 +1046,14 @@
stamp-${host_alias}:
@-mkdir -p ${host_builddir}
+ @-mkdir -p ${host_builddir}/../ext
@$(STAMP) stamp-${host_alias}
# Host includes static.
# XXX Missing dependency info for {host_headers_extra}
-stamp-host: ${host_headers} ${host_headers_noinst} stamp-${host_alias}
+stamp-host: ${host_headers} ${bits_host_headers} ${ext_host_headers} ${host_headers_noinst} stamp-${host_alias}
@cd ${host_builddir} && {\
- $(LN_S) ${host_headers} . || true ;\
+ $(LN_S) ${host_headers} ${bits_host_headers} . || true ;\
$(LN_S) ${glibcxx_srcdir}/$(BASIC_FILE_H) basic_file.h || true ;\
$(LN_S) ${glibcxx_srcdir}/$(ALLOCATOR_H) c++allocator.h || true ;\
$(LN_S) ${glibcxx_srcdir}/$(CSTDIO_H) c++io.h || true ;\
@@ -1064,6 +1063,9 @@
$(LN_S) ${glibcxx_srcdir}/$(CMESSAGES_H) messages_members.h || true ;\
$(LN_S) ${glibcxx_srcdir}/$(CTIME_H) time_members.h || true;\
} 2>/dev/null
+ @cd ${host_builddir}/../ext && {\
+ $(LN_S) ${ext_host_headers} . || true ;\
+ } 2>/dev/null
$(STAMP) stamp-host
# Host includes dynamic.
@@ -1290,9 +1292,12 @@
for file in ${profile_impl_headers}; do \
$(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${profile_impl_builddir}; done
$(mkinstalldirs) $(DESTDIR)${host_installdir}
- for file in ${host_headers} ${host_headers_extra} \
+ for file in ${host_headers} ${bits_host_headers} ${host_headers_extra} \
${thread_host_headers}; do \
$(INSTALL_DATA) $${file} $(DESTDIR)${host_installdir}; done
+ $(mkinstalldirs) $(DESTDIR)${host_installdir}/../ext
+ for file in ${ext_host_headers}; do \
+ $(INSTALL_DATA) $${file} $(DESTDIR)${host_installdir}/../ext; done
# By adding these files here, automake will remove them for 'make clean'
CLEANFILES = ${pch_output} ${pch_output_anchors} stamp-host
next reply other threads:[~2013-05-12 9:58 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-12 9:58 Matthias Klose [this message]
2013-05-17 7:36 ` [ping] " Matthias Klose
2013-05-18 19:32 ` Paolo Carlini
2013-05-19 0:06 ` Matthias Klose
2013-05-19 9:35 ` Andreas Schwab
2013-05-19 9:40 ` Paolo Carlini
2013-05-21 8:26 ` Matthias Klose
2013-05-22 9:18 ` Paolo Carlini
2013-06-10 17:54 ` Matthias Klose
2013-06-10 19:29 ` Paolo Carlini
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=518F67BF.8090500@ubuntu.com \
--to=doko@ubuntu.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=libstdc++@gcc.gnu.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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).