← Back to branch summary

~ubuntu-branches/debian/sid/gcc-4.8/sid

« back to all changes in this revision

Viewing changes to .svn/pristine/e0/e0658b55e89b8cebd0f907d406c05c94137c8333.svn-base

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-12-19 19:48:34 UTC
  • Revision ID: package-import@ubuntu.com-20141219194834-4dz1q7rrn5pad823
Tags: 4.8.4-1
* GCC 4.8.4 release.
  - Fix PR target/61407 (darwin), PR middle-end/58624 (ice),
    PR sanitizer/64265 (wrong code).
* Require recent binutils to pass go test failures.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.svn/pristine/e0/e0658b55e89b8cebd0f907d406c05c94137c8333.svn-base
 
1
# DP: Install host specific libstdc++ headers into the host include dir
 
2
 
 
3
2013-05-11  Matthias Klose  <doko@ubuntu.com>
 
4
 
 
5
        * include/Makefile.am (bits_headers): Remove ${bits_host_headers}.
 
6
        (ext_headers): Remove ${ext_host_headers}.
 
7
        (stamp-${host_alias}): Create ${host_builddir}/../ext.
 
8
        (stamp-host): Link ${bits_host_headers} and ${ext_host_headers}.
 
9
        (install-headers): Install ${bits_host_headers} and ${ext_host_headers}.
 
10
        * include/Makefile.in: Regenerate.
 
11
 
 
12
Index: libstdc++-v3/include/Makefile.am
 
13
===================================================================
 
14
--- a/src/libstdc++-v3/include/Makefile.am      (revision 198799)
 
15
+++ a/src/libstdc++-v3/include/Makefile.am      (working copy)
 
16
@@ -172,8 +172,7 @@
 
17
        ${bits_srcdir}/valarray_array.tcc \
 
18
        ${bits_srcdir}/valarray_before.h \
 
19
        ${bits_srcdir}/valarray_after.h \
 
20
-       ${bits_srcdir}/vector.tcc \
 
21
-       ${bits_host_headers}
 
22
+       ${bits_srcdir}/vector.tcc
 
23
 
 
24
 bits_host_headers = \
 
25
        ${glibcxx_srcdir}/${CPU_OPT_BITS_RANDOM}
 
26
@@ -535,8 +534,7 @@
 
27
        ${ext_srcdir}/vstring.tcc \
 
28
        ${ext_srcdir}/vstring_fwd.h \
 
29
        ${ext_srcdir}/vstring_util.h \
 
30
-       ${ext_compat_headers} \
 
31
-       ${ext_host_headers}
 
32
+       ${ext_compat_headers}
 
33
 
 
34
 ext_compat_headers = \
 
35
        ${backward_srcdir}/hash_set \
 
36
@@ -1048,13 +1046,14 @@
 
37
 
 
38
 stamp-${host_alias}:
 
39
        @-mkdir -p ${host_builddir}
 
40
+       @-mkdir -p ${host_builddir}/../ext
 
41
        @$(STAMP) stamp-${host_alias}
 
42
 
 
43
 # Host includes static.
 
44
 # XXX Missing dependency info for {host_headers_extra}
 
45
-stamp-host: ${host_headers} ${host_headers_noinst} stamp-${host_alias}
 
46
+stamp-host: ${host_headers} ${bits_host_headers} ${ext_host_headers} ${host_headers_noinst} stamp-${host_alias}
 
47
        @cd ${host_builddir} && {\
 
48
-         $(LN_S) ${host_headers} . || true ;\
 
49
+         $(LN_S) ${host_headers} ${bits_host_headers} . || true ;\
 
50
          $(LN_S) ${glibcxx_srcdir}/$(BASIC_FILE_H) basic_file.h || true ;\
 
51
          $(LN_S) ${glibcxx_srcdir}/$(ALLOCATOR_H) c++allocator.h || true ;\
 
52
          $(LN_S) ${glibcxx_srcdir}/$(CSTDIO_H) c++io.h || true ;\
 
53
@@ -1064,6 +1063,9 @@
 
54
          $(LN_S) ${glibcxx_srcdir}/$(CMESSAGES_H) messages_members.h || true ;\
 
55
          $(LN_S) ${glibcxx_srcdir}/$(CTIME_H) time_members.h || true;\
 
56
        } 2>/dev/null
 
57
+       @cd ${host_builddir}/../ext && {\
 
58
+         $(LN_S) ${ext_host_headers} . || true ;\
 
59
+       } 2>/dev/null
 
60
        $(STAMP) stamp-host
 
61
 
 
62
 # Host includes dynamic.
 
63
@@ -1290,9 +1292,12 @@
 
64
        for file in ${profile_impl_headers}; do \
 
65
          $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${profile_impl_builddir}; done
 
66
        $(mkinstalldirs) $(DESTDIR)${host_installdir}
 
67
-       for file in ${host_headers} ${host_headers_extra} \
 
68
+       for file in ${host_headers} ${bits_host_headers} ${host_headers_extra} \
 
69
         ${thread_host_headers}; do \
 
70
          $(INSTALL_DATA) $${file} $(DESTDIR)${host_installdir}; done
 
71
+       $(mkinstalldirs) $(DESTDIR)${host_installdir}/../ext
 
72
+       for file in ${ext_host_headers}; do \
 
73
+         $(INSTALL_DATA) $${file} $(DESTDIR)${host_installdir}/../ext; done
 
74
 
 
75
 # By adding these files here, automake will remove them for 'make clean'
 
76
 CLEANFILES = ${pch_output} ${pch_output_anchors} stamp-host
 
77
Index: libstdc++-v3/include/Makefile.in
 
78
===================================================================
 
79
--- a/src/libstdc++-v3/include/Makefile.in      (revision 198799)
 
80
+++ a/src/libstdc++-v3/include/Makefile.in      (working copy)
 
81
@@ -434,8 +434,7 @@
 
82
        ${bits_srcdir}/valarray_array.tcc \
 
83
        ${bits_srcdir}/valarray_before.h \
 
84
        ${bits_srcdir}/valarray_after.h \
 
85
-       ${bits_srcdir}/vector.tcc \
 
86
-       ${bits_host_headers}
 
87
+       ${bits_srcdir}/vector.tcc
 
88
 
 
89
 bits_host_headers = \
 
90
        ${glibcxx_srcdir}/${CPU_OPT_BITS_RANDOM}
 
91
@@ -795,8 +794,7 @@
 
92
        ${ext_srcdir}/vstring.tcc \
 
93
        ${ext_srcdir}/vstring_fwd.h \
 
94
        ${ext_srcdir}/vstring_util.h \
 
95
-       ${ext_compat_headers} \
 
96
-       ${ext_host_headers}
 
97
+       ${ext_compat_headers}
 
98
 
 
99
 ext_compat_headers = \
 
100
        ${backward_srcdir}/hash_set \
 
101
@@ -1461,13 +1459,14 @@
 
102
 
 
103
 stamp-${host_alias}:
 
104
        @-mkdir -p ${host_builddir}
 
105
+       @-mkdir -p ${host_builddir}/../ext
 
106
        @$(STAMP) stamp-${host_alias}
 
107
 
 
108
 # Host includes static.
 
109
 # XXX Missing dependency info for {host_headers_extra}
 
110
-stamp-host: ${host_headers} ${host_headers_noinst} stamp-${host_alias}
 
111
+stamp-host: ${host_headers} ${bits_host_headers} ${ext_host_headers} ${host_headers_noinst} stamp-${host_alias}
 
112
        @cd ${host_builddir} && {\
 
113
-         $(LN_S) ${host_headers} . || true ;\
 
114
+         $(LN_S) ${host_headers} ${bits_host_headers} . || true ;\
 
115
          $(LN_S) ${glibcxx_srcdir}/$(BASIC_FILE_H) basic_file.h || true ;\
 
116
          $(LN_S) ${glibcxx_srcdir}/$(ALLOCATOR_H) c++allocator.h || true ;\
 
117
          $(LN_S) ${glibcxx_srcdir}/$(CSTDIO_H) c++io.h || true ;\
 
118
@@ -1477,6 +1476,9 @@
 
119
          $(LN_S) ${glibcxx_srcdir}/$(CMESSAGES_H) messages_members.h || true ;\
 
120
          $(LN_S) ${glibcxx_srcdir}/$(CTIME_H) time_members.h || true;\
 
121
        } 2>/dev/null
 
122
+       @cd ${host_builddir}/../ext && {\
 
123
+         $(LN_S) ${ext_host_headers} . || true ;\
 
124
+       } 2>/dev/null
 
125
        $(STAMP) stamp-host
 
126
 
 
127
 # Host includes dynamic.
 
128
@@ -1688,9 +1690,12 @@
 
129
        for file in ${profile_impl_headers}; do \
 
130
          $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${profile_impl_builddir}; done
 
131
        $(mkinstalldirs) $(DESTDIR)${host_installdir}
 
132
-       for file in ${host_headers} ${host_headers_extra} \
 
133
+       for file in ${host_headers} ${bits_host_headers} ${host_headers_extra} \
 
134
         ${thread_host_headers}; do \
 
135
          $(INSTALL_DATA) $${file} $(DESTDIR)${host_installdir}; done
 
136
+       $(mkinstalldirs) $(DESTDIR)${host_installdir}/../ext
 
137
+       for file in ${ext_host_headers}; do \
 
138
+         $(INSTALL_DATA) $${file} $(DESTDIR)${host_installdir}/../ext; done
 
139
 
 
140
 # To remove directories.
 
141
 clean-local: