Attachment 'multiarch_headers.patch'
Download 1 diff -ruN orig/glibc-2.21/debian/changelog glibc-2.21/debian/changelog
2 --- orig/glibc-2.21/debian/changelog 2015-08-29 00:45:01.000000000 +0200
3 +++ glibc-2.21/debian/changelog 2015-09-14 01:50:54.855732954 +0200
4 @@ -1,3 +1,12 @@
5 +glibc (2.21-0experimental1+multiarchheaders.1) UNRELEASED; urgency=medium
6 +
7 + * Support for multiarch headers: move headers from /usr/include
8 + to /usr/include/$(DEB_HOST_MULTIARCH).
9 + * Remove conflicts between libc0.1-dev, libc0.3-dev, libc6-dev,
10 + and libc6.1-dev.
11 +
12 + -- Aurélien Gérôme <ag@debian.org> Mon, 14 Sep 2015 01:45:00 +0200
13 +
14 glibc (2.21-0experimental1) experimental; urgency=medium
15
16 [ Samuel Thibault ]
17 diff -ruN orig/glibc-2.21/debian/control glibc-2.21/debian/control
18 --- orig/glibc-2.21/debian/control 2015-08-29 00:37:20.000000000 +0200
19 +++ glibc-2.21/debian/control 2015-09-13 23:21:24.140541212 +0200
20 @@ -194,7 +194,6 @@
21 Suggests: glibc-doc, manpages-dev
22 Provides: libc-dev, libc6-dev [alpha hurd-i386 kfreebsd-i386 kfreebsd-amd64]
23 Breaks: binutils (<< 2.20.1-1), binutils-gold (<< 2.20.1-11), cmake (<< 2.8.4+dfsg.1-5), gcc-4.4 (<< 4.4.6-4), gcc-4.5 (<< 4.5.3-2), gcc-4.6 (<< 4.6.0-12), make (<< 3.81-8.1), pkg-config (<< 0.26-1), libjna-java (<< 3.2.7-4), liblouis-dev (<< 2.3.0-2), liblouisxml-dev (<< 2.4.0-2), libhwloc-dev (<< 1.2-3), check (<< 0.9.10-6.1+b1) [s390x]
24 -Conflicts: libc6.1-dev, libc0.1-dev, libc0.3-dev,
25 Description: GNU C Library: Development Libraries and Header Files
26 Contains the symlinks, headers, and object files needed to compile
27 and link programs which use the standard C library.
28 @@ -280,7 +279,6 @@
29 Suggests: glibc-doc, manpages-dev
30 Provides: libc-dev, libc6-dev [alpha hurd-i386 kfreebsd-i386 kfreebsd-amd64]
31 Breaks: binutils (<< 2.20.1-1), binutils-gold (<< 2.20.1-11), cmake (<< 2.8.4+dfsg.1-5), gcc-4.4 (<< 4.4.6-4), gcc-4.5 (<< 4.5.3-2), gcc-4.6 (<< 4.6.0-12), make (<< 3.81-8.1), pkg-config (<< 0.26-1), libjna-java (<< 3.2.7-4), liblouis-dev (<< 2.3.0-2), liblouisxml-dev (<< 2.4.0-2), libhwloc-dev (<< 1.2-3), check (<< 0.9.10-6.1+b1) [s390x]
32 -Conflicts: libc6-dev, libc0.1-dev, libc0.3-dev,
33 Description: GNU C Library: Development Libraries and Header Files
34 Contains the symlinks, headers, and object files needed to compile
35 and link programs which use the standard C library.
36 @@ -366,7 +364,6 @@
37 Suggests: glibc-doc, manpages-dev
38 Provides: libc-dev, libc6-dev [alpha hurd-i386 kfreebsd-i386 kfreebsd-amd64]
39 Breaks: binutils (<< 2.20.1-1), binutils-gold (<< 2.20.1-11), cmake (<< 2.8.4+dfsg.1-5), gcc-4.4 (<< 4.4.6-4), gcc-4.5 (<< 4.5.3-2), gcc-4.6 (<< 4.6.0-12), make (<< 3.81-8.1), pkg-config (<< 0.26-1), libjna-java (<< 3.2.7-4), liblouis-dev (<< 2.3.0-2), liblouisxml-dev (<< 2.4.0-2), libhwloc-dev (<< 1.2-3), check (<< 0.9.10-6.1+b1) [s390x]
40 -Conflicts: libc6-dev, libc6.1-dev, libc0.1-dev,
41 Description: GNU C Library: Development Libraries and Header Files
42 Contains the symlinks, headers, and object files needed to compile
43 and link programs which use the standard C library.
44 @@ -452,7 +449,6 @@
45 Suggests: glibc-doc, manpages-dev
46 Provides: libc-dev, libc6-dev [alpha hurd-i386 kfreebsd-i386 kfreebsd-amd64]
47 Breaks: binutils (<< 2.20.1-1), binutils-gold (<< 2.20.1-11), cmake (<< 2.8.4+dfsg.1-5), gcc-4.4 (<< 4.4.6-4), gcc-4.5 (<< 4.5.3-2), gcc-4.6 (<< 4.6.0-12), make (<< 3.81-8.1), pkg-config (<< 0.26-1), libjna-java (<< 3.2.7-4), liblouis-dev (<< 2.3.0-2), liblouisxml-dev (<< 2.4.0-2), libhwloc-dev (<< 1.2-3), check (<< 0.9.10-6.1+b1) [s390x]
48 -Conflicts: libc6-dev, libc6.1-dev, libc0.3-dev,
49 Description: GNU C Library: Development Libraries and Header Files
50 Contains the symlinks, headers, and object files needed to compile
51 and link programs which use the standard C library.
52 diff -ruN orig/glibc-2.21/debian/control.in/libc glibc-2.21/debian/control.in/libc
53 --- orig/glibc-2.21/debian/control.in/libc 2015-08-29 00:36:30.000000000 +0200
54 +++ glibc-2.21/debian/control.in/libc 2015-09-13 23:36:45.432784047 +0200
55 @@ -37,7 +37,6 @@
56 Suggests: glibc-doc, manpages-dev
57 Provides: libc-dev, libc6-dev [alpha hurd-i386 kfreebsd-i386 kfreebsd-amd64]
58 Breaks: binutils (<< 2.20.1-1), binutils-gold (<< 2.20.1-11), cmake (<< 2.8.4+dfsg.1-5), gcc-4.4 (<< 4.4.6-4), gcc-4.5 (<< 4.5.3-2), gcc-4.6 (<< 4.6.0-12), make (<< 3.81-8.1), pkg-config (<< 0.26-1), libjna-java (<< 3.2.7-4), liblouis-dev (<< 2.3.0-2), liblouisxml-dev (<< 2.4.0-2), libhwloc-dev (<< 1.2-3), check (<< 0.9.10-6.1+b1) [s390x]
59 -Conflicts: @libc-dev-conflict@
60 Description: GNU C Library: Development Libraries and Header Files
61 Contains the symlinks, headers, and object files needed to compile
62 and link programs which use the standard C library.
63 diff -ruN orig/glibc-2.21/debian/rules glibc-2.21/debian/rules
64 --- orig/glibc-2.21/debian/rules 2015-08-29 00:36:30.000000000 +0200
65 +++ glibc-2.21/debian/rules 2015-09-13 19:22:22.796018573 +0200
66 @@ -89,7 +89,7 @@
67 sysconfdir=/etc
68 libexecdir=$(prefix)/lib
69 rootsbindir=/sbin
70 -includedir=$(prefix)/include
71 +includedir=$(prefix)/include/$(DEB_HOST_MULTIARCH)
72 docdir=$(prefix)/share/doc
73 mandir=$(prefix)/share/man
74 sbindir=$(prefix)/sbin
75 diff -ruN orig/glibc-2.21/debian/rules.d/build.mk glibc-2.21/debian/rules.d/build.mk
76 --- orig/glibc-2.21/debian/rules.d/build.mk 2015-08-23 00:24:40.000000000 +0200
77 +++ glibc-2.21/debian/rules.d/build.mk 2015-09-13 23:43:14.248533196 +0200
78 @@ -217,13 +217,6 @@
79 echo "/lib/$(DEB_HOST_GNU_TYPE)" >> $$conffile; \
80 echo "/usr/lib/$(DEB_HOST_GNU_TYPE)" >> $$conffile; \
81 fi; \
82 - mkdir -p debian/tmp-$(curpass)/usr/include/$(DEB_HOST_MULTIARCH); \
83 - mv debian/tmp-$(curpass)/usr/include/bits debian/tmp-$(curpass)/usr/include/$(DEB_HOST_MULTIARCH); \
84 - mv debian/tmp-$(curpass)/usr/include/gnu debian/tmp-$(curpass)/usr/include/$(DEB_HOST_MULTIARCH); \
85 - mv debian/tmp-$(curpass)/usr/include/sys debian/tmp-$(curpass)/usr/include/$(DEB_HOST_MULTIARCH); \
86 - mv debian/tmp-$(curpass)/usr/include/fpu_control.h debian/tmp-$(curpass)/usr/include/$(DEB_HOST_MULTIARCH); \
87 - mv debian/tmp-$(curpass)/usr/include/a.out.h debian/tmp-$(curpass)/usr/include/$(DEB_HOST_MULTIARCH); \
88 - mv debian/tmp-$(curpass)/usr/include/ieee754.h debian/tmp-$(curpass)/usr/include/$(DEB_HOST_MULTIARCH); \
89 fi
90
91 ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
92 diff -ruN orig/glibc-2.21/debian/rules.d/control.mk glibc-2.21/debian/rules.d/control.mk
93 --- orig/glibc-2.21/debian/rules.d/control.mk 2015-03-24 07:52:12.000000000 +0100
94 +++ glibc-2.21/debian/rules.d/control.mk 2015-09-13 23:36:15.917417570 +0200
95 @@ -9,7 +9,6 @@
96 $(patsubst %,debian/control.in/%,$(libc_packages)) :: debian/control.in/% : debian/control.in/libc debian/rules.d/control.mk
97 sed -e "s%@libc@%$*%g" \
98 -e "s%@archs@%$($(subst .,_,$*)_archs)%g" \
99 - -e "s%@libc-dev-conflict@%$(foreach arch,$(filter-out $*,$(libc_packages)),$(arch)-dev,)%g" \
100 < $< > $@
101
102 debian/control: $(stamp)control
103 diff -ruN orig/glibc-2.21/debian/sysdeps/amd64.mk glibc-2.21/debian/sysdeps/amd64.mk
104 --- orig/glibc-2.21/debian/sysdeps/amd64.mk 2015-03-16 17:03:45.000000000 +0100
105 +++ glibc-2.21/debian/sysdeps/amd64.mk 2015-09-13 22:55:52.101504801 +0200
106 @@ -22,7 +22,7 @@
107 ln -sf x86_64-linux-gnu/fpu_control.h debian/libc6-dev-i386/usr/include/
108
109 mkdir -p debian/libc6-dev-i386/usr/include/x86_64-linux-gnu/gnu
110 -cp -a debian/tmp-i386/usr/include/gnu/stubs-32.h \
111 +cp -a debian/tmp-i386/usr/include/x86_64-linux-gnu/gnu/stubs-32.h \
112 debian/libc6-dev-i386/usr/include/x86_64-linux-gnu/gnu
113
114 mkdir -p debian/libc6-dev-i386/usr/include/sys
115 @@ -53,7 +53,7 @@
116 define libc6-dev-x32_extra_pkg_install
117
118 mkdir -p debian/libc6-dev-x32/usr/include/x86_64-linux-gnu/gnu
119 -cp -a debian/tmp-x32/usr/include/gnu/stubs-x32.h \
120 +cp -a debian/tmp-x32/usr/include/x86_64-linux-gnu/gnu/stubs-x32.h \
121 debian/libc6-dev-x32/usr/include/x86_64-linux-gnu/gnu/
122
123 endef
124 diff -ruN orig/glibc-2.21/debian/sysdeps/i386.mk glibc-2.21/debian/sysdeps/i386.mk
125 --- orig/glibc-2.21/debian/sysdeps/i386.mk 2015-03-16 17:03:45.000000000 +0100
126 +++ glibc-2.21/debian/sysdeps/i386.mk 2015-09-13 23:08:10.265532354 +0200
127 @@ -67,7 +67,7 @@
128 ln -sf i386-linux-gnu/fpu_control.h debian/libc6-dev-amd64/usr/include/
129
130 mkdir -p debian/libc6-dev-amd64/usr/include/i386-linux-gnu/gnu
131 -cp -a debian/tmp-amd64/usr/include/gnu/stubs-64.h \
132 +cp -a debian/tmp-amd64/usr/include/i386-linux-gnu/gnu/stubs-64.h \
133 debian/libc6-dev-amd64/usr/include/i386-linux-gnu/gnu
134
135 mkdir -p debian/libc6-dev-amd64/usr/include/sys
136 @@ -93,7 +93,7 @@
137 define libc6-dev-x32_extra_pkg_install
138
139 mkdir -p debian/libc6-dev-x32/usr/include/i386-linux-gnu/gnu
140 -cp -a debian/tmp-x32/usr/include/gnu/stubs-x32.h \
141 +cp -a debian/tmp-x32/usr/include/i386-linux-gnu/gnu/stubs-x32.h \
142 debian/libc6-dev-x32/usr/include/i386-linux-gnu/gnu
143
144 endef
145 diff -ruN orig/glibc-2.21/debian/sysdeps/kfreebsd-amd64.mk glibc-2.21/debian/sysdeps/kfreebsd-amd64.mk
146 --- orig/glibc-2.21/debian/sysdeps/kfreebsd-amd64.mk 2015-03-16 17:03:45.000000000 +0100
147 +++ glibc-2.21/debian/sysdeps/kfreebsd-amd64.mk 2015-09-13 23:09:18.068082573 +0200
148 @@ -23,7 +23,7 @@
149 ln -s x86_64-kfreebsd-gnu/fpu_control.h debian/libc0.1-dev-i386/usr/include/
150
151 mkdir -p debian/libc0.1-dev-i386/usr/include/x86_64-kfreebsd-gnu/gnu
152 -cp -a debian/tmp-i386/usr/include/gnu/stubs-32.h \
153 +cp -a debian/tmp-i386/usr/include/x86_64-kfreebsd-gnu/gnu/stubs-32.h \
154 debian/libc0.1-dev-i386/usr/include/x86_64-kfreebsd-gnu/gnu
155
156 mkdir -p debian/libc0.1-dev-i386/usr/include/sys
157 diff -ruN orig/glibc-2.21/debian/sysdeps/mips64el.mk glibc-2.21/debian/sysdeps/mips64el.mk
158 --- orig/glibc-2.21/debian/sysdeps/mips64el.mk 2015-03-16 17:03:45.000000000 +0100
159 +++ glibc-2.21/debian/sysdeps/mips64el.mk 2015-09-13 23:11:07.641739053 +0200
160 @@ -38,7 +38,7 @@
161 ln -sf mips64el-linux-gnuabi64/fpu_control.h debian/libc6-dev-mipsn32/usr/include/
162
163 mkdir -p debian/libc6-dev-mipsn32/usr/include/mips64el-linux-gnuabi64/gnu
164 -cp -a debian/tmp-mipsn32/usr/include/gnu/stubs-n32_hard.h \
165 +cp -a debian/tmp-mipsn32/usr/include/mips64el-linux-gnuabi64/gnu/stubs-n32_hard.h \
166 debian/libc6-dev-mipsn32/usr/include/mips64el-linux-gnuabi64/gnu
167
168 mkdir -p debian/libc6-dev-mipsn32/usr/include/sys
169 @@ -51,7 +51,7 @@
170 define libc6-dev-mips32_extra_pkg_install
171
172 mkdir -p debian/libc6-dev-mips32/usr/include/mips64el-linux-gnuabi64/gnu
173 -cp -a debian/tmp-mips32/usr/include/gnu/stubs-o32_hard.h \
174 +cp -a debian/tmp-mips32/usr/include/mips64el-linux-gnuabi64/gnu/stubs-o32_hard.h \
175 debian/libc6-dev-mips32/usr/include/mips64el-linux-gnuabi64/gnu
176
177 endef
178 diff -ruN orig/glibc-2.21/debian/sysdeps/mips64.mk glibc-2.21/debian/sysdeps/mips64.mk
179 --- orig/glibc-2.21/debian/sysdeps/mips64.mk 2015-03-16 17:03:45.000000000 +0100
180 +++ glibc-2.21/debian/sysdeps/mips64.mk 2015-09-13 23:12:03.860536396 +0200
181 @@ -38,7 +38,7 @@
182 ln -sf mips64-linux-gnuabi64/fpu_control.h debian/libc6-dev-mipsn32/usr/include/
183
184 mkdir -p debian/libc6-dev-mipsn32/usr/include/mips64-linux-gnuabi64/gnu
185 -cp -a debian/tmp-mipsn32/usr/include/gnu/stubs-n32_hard.h \
186 +cp -a debian/tmp-mipsn32/usr/include/mips64-linux-gnuabi64/gnu/stubs-n32_hard.h \
187 debian/libc6-dev-mipsn32/usr/include/mips64-linux-gnuabi64/gnu
188
189 mkdir -p debian/libc6-dev-mipsn32/usr/include/sys
190 @@ -51,7 +51,7 @@
191 define libc6-dev-mips32_extra_pkg_install
192
193 mkdir -p debian/libc6-dev-mips32/usr/include/mips64-linux-gnuabi64/gnu
194 -cp -a debian/tmp-mips32/usr/include/gnu/stubs-o32_hard.h \
195 +cp -a debian/tmp-mips32/usr/include/mips64-linux-gnuabi64/gnu/stubs-o32_hard.h \
196 debian/libc6-dev-mips32/usr/include/mips64-linux-gnuabi64/gnu
197
198 endef
199 diff -ruN orig/glibc-2.21/debian/sysdeps/mipsel.mk glibc-2.21/debian/sysdeps/mipsel.mk
200 --- orig/glibc-2.21/debian/sysdeps/mipsel.mk 2015-03-16 17:03:45.000000000 +0100
201 +++ glibc-2.21/debian/sysdeps/mipsel.mk 2015-09-13 23:12:36.651834827 +0200
202 @@ -37,7 +37,7 @@
203 ln -sf mipsel-linux-gnu/fpu_control.h debian/libc6-dev-mips64/usr/include/
204
205 mkdir -p debian/libc6-dev-mips64/usr/include/mipsel-linux-gnu/gnu
206 -cp -a debian/tmp-mips64/usr/include/gnu/stubs-n64_hard.h \
207 +cp -a debian/tmp-mips64/usr/include/mipsel-linux-gnu/gnu/stubs-n64_hard.h \
208 debian/libc6-dev-mips64/usr/include/mipsel-linux-gnu/gnu
209
210 mkdir -p debian/libc6-dev-mips64/usr/include/sys
211 @@ -50,7 +50,7 @@
212 define libc6-dev-mipsn32_extra_pkg_install
213
214 mkdir -p debian/libc6-dev-mipsn32/usr/include/mipsel-linux-gnu/gnu
215 -cp -a debian/tmp-mipsn32/usr/include/gnu/stubs-n32_hard.h \
216 +cp -a debian/tmp-mipsn32/usr/include/mipsel-linux-gnu/gnu/stubs-n32_hard.h \
217 debian/libc6-dev-mipsn32/usr/include/mipsel-linux-gnu/gnu
218
219 endef
220 diff -ruN orig/glibc-2.21/debian/sysdeps/mips.mk glibc-2.21/debian/sysdeps/mips.mk
221 --- orig/glibc-2.21/debian/sysdeps/mips.mk 2015-03-16 17:03:45.000000000 +0100
222 +++ glibc-2.21/debian/sysdeps/mips.mk 2015-09-13 23:12:59.623343317 +0200
223 @@ -37,7 +37,7 @@
224 ln -sf mips-linux-gnu/fpu_control.h debian/libc6-dev-mips64/usr/include/
225
226 mkdir -p debian/libc6-dev-mips64/usr/include/mips-linux-gnu/gnu
227 -cp -a debian/tmp-mips64/usr/include/gnu/stubs-n64_hard.h \
228 +cp -a debian/tmp-mips64/usr/include/mips-linux-gnu/gnu/stubs-n64_hard.h \
229 debian/libc6-dev-mips64/usr/include/mips-linux-gnu/gnu
230
231 mkdir -p debian/libc6-dev-mips64/usr/include/sys
232 @@ -50,7 +50,7 @@
233 define libc6-dev-mipsn32_extra_pkg_install
234
235 mkdir -p debian/libc6-dev-mipsn32/usr/include/mips-linux-gnu/gnu
236 -cp -a debian/tmp-mipsn32/usr/include/gnu/stubs-n32_hard.h \
237 +cp -a debian/tmp-mipsn32/usr/include/mips-linux-gnu/gnu/stubs-n32_hard.h \
238 debian/libc6-dev-mipsn32/usr/include/mips-linux-gnu/gnu
239
240 endef
241 diff -ruN orig/glibc-2.21/debian/sysdeps/mipsn32el.mk glibc-2.21/debian/sysdeps/mipsn32el.mk
242 --- orig/glibc-2.21/debian/sysdeps/mipsn32el.mk 2015-03-16 17:03:45.000000000 +0100
243 +++ glibc-2.21/debian/sysdeps/mipsn32el.mk 2015-09-13 23:13:28.462726212 +0200
244 @@ -38,7 +38,7 @@
245 ln -sf mips64el-linux-gnuabin32/fpu_control.h debian/libc6-dev-mips64/usr/include/
246
247 mkdir -p debian/libc6-dev-mips64/usr/include/mips64el-linux-gnuabin32/gnu
248 -cp -a debian/tmp-mips64/usr/include/gnu/stubs-n64_hard.h \
249 +cp -a debian/tmp-mips64/usr/include/mips64el-linux-gnuabin32/gnu/stubs-n64_hard.h \
250 debian/libc6-dev-mips64/usr/include/mips64el-linux-gnuabin32/gnu
251
252 mkdir -p debian/libc6-dev-mips64/usr/include/sys
253 @@ -51,7 +51,7 @@
254 define libc6-dev-mips32_extra_pkg_install
255
256 mkdir -p debian/libc6-dev-mips32/usr/include/mips64el-linux-gnuabin32/gnu
257 -cp -a debian/tmp-mips32/usr/include/gnu/stubs-o32_hard.h \
258 +cp -a debian/tmp-mips32/usr/include/mips64el-linux-gnuabin32/gnu/stubs-o32_hard.h \
259 debian/libc6-dev-mips32/usr/include/mips64el-linux-gnuabin32/gnu
260
261 endef
262 diff -ruN orig/glibc-2.21/debian/sysdeps/mipsn32.mk glibc-2.21/debian/sysdeps/mipsn32.mk
263 --- orig/glibc-2.21/debian/sysdeps/mipsn32.mk 2015-03-16 17:03:45.000000000 +0100
264 +++ glibc-2.21/debian/sysdeps/mipsn32.mk 2015-09-13 23:13:53.234196116 +0200
265 @@ -38,7 +38,7 @@
266 ln -sf mips64-linux-gnuabin32/fpu_control.h debian/libc6-dev-mips64/usr/include/
267
268 mkdir -p debian/libc6-dev-mips64/usr/include/mips64-linux-gnuabin32/gnu
269 -cp -a debian/tmp-mips64/usr/include/gnu/stubs-n64_hard.h \
270 +cp -a debian/tmp-mips64/usr/include/mips64-linux-gnuabin32/gnu/stubs-n64_hard.h \
271 debian/libc6-dev-mips64/usr/include/mips64-linux-gnuabin32/gnu
272
273 mkdir -p debian/libc6-dev-mips64/usr/include/sys
274 @@ -51,7 +51,7 @@
275 define libc6-dev-mips32_extra_pkg_install
276
277 mkdir -p debian/libc6-dev-mips32/usr/include/mips64-linux-gnuabin32/gnu
278 -cp -a debian/tmp-mips32/usr/include/gnu/stubs-o32_hard.h \
279 +cp -a debian/tmp-mips32/usr/include/mips64-linux-gnuabin32/gnu/stubs-o32_hard.h \
280 debian/libc6-dev-mips32/usr/include/mips64-linux-gnuabin32/gnu
281
282 endef
283 diff -ruN orig/glibc-2.21/debian/sysdeps/powerpc.mk glibc-2.21/debian/sysdeps/powerpc.mk
284 --- orig/glibc-2.21/debian/sysdeps/powerpc.mk 2015-03-18 12:13:49.000000000 +0100
285 +++ glibc-2.21/debian/sysdeps/powerpc.mk 2015-09-13 23:14:18.609653059 +0200
286 @@ -21,7 +21,7 @@
287 ln -s powerpc-linux-gnu/fpu_control.h debian/libc6-dev-ppc64/usr/include/
288
289 mkdir -p debian/libc6-dev-ppc64/usr/include/powerpc-linux-gnu/gnu
290 -cp -a debian/tmp-ppc64/usr/include/gnu/stubs-64-v1.h \
291 +cp -a debian/tmp-ppc64/usr/include/powerpc-linux-gnu/gnu/stubs-64-v1.h \
292 debian/libc6-dev-ppc64/usr/include/powerpc-linux-gnu/gnu
293
294 mkdir -p debian/libc6-dev-ppc64/usr/include/sys
295 diff -ruN orig/glibc-2.21/debian/sysdeps/ppc64.mk glibc-2.21/debian/sysdeps/ppc64.mk
296 --- orig/glibc-2.21/debian/sysdeps/ppc64.mk 2015-03-18 12:13:49.000000000 +0100
297 +++ glibc-2.21/debian/sysdeps/ppc64.mk 2015-09-13 23:14:45.961067675 +0200
298 @@ -21,7 +21,7 @@
299 ln -s powerpc64-linux-gnu/fpu_control.h debian/libc6-dev-powerpc/usr/include/
300
301 mkdir -p debian/libc6-dev-powerpc/usr/include/powerpc64-linux-gnu/gnu
302 -cp -a debian/tmp-powerpc/usr/include/gnu/stubs-32.h \
303 +cp -a debian/tmp-powerpc/usr/include/powerpc64-linux-gnu/gnu/stubs-32.h \
304 debian/libc6-dev-powerpc/usr/include/powerpc64-linux-gnu/gnu
305
306 mkdir -p debian/libc6-dev-powerpc/usr/include/sys
307 diff -ruN orig/glibc-2.21/debian/sysdeps/s390x.mk glibc-2.21/debian/sysdeps/s390x.mk
308 --- orig/glibc-2.21/debian/sysdeps/s390x.mk 2015-03-16 17:03:45.000000000 +0100
309 +++ glibc-2.21/debian/sysdeps/s390x.mk 2015-09-13 23:15:02.100722229 +0200
310 @@ -20,7 +20,7 @@
311 ln -s s390x-linux-gnu/fpu_control.h debian/libc6-dev-s390/usr/include/
312
313 mkdir -p debian/libc6-dev-s390/usr/include/s390x-linux-gnu/gnu
314 -cp -a debian/tmp-s390/usr/include/gnu/stubs-32.h \
315 +cp -a debian/tmp-s390/usr/include/s390x-linux-gnu/gnu/stubs-32.h \
316 debian/libc6-dev-s390/usr/include/s390x-linux-gnu/gnu
317
318 mkdir -p debian/libc6-dev-s390/usr/include/sys
319 diff -ruN orig/glibc-2.21/debian/sysdeps/sparc64.mk glibc-2.21/debian/sysdeps/sparc64.mk
320 --- orig/glibc-2.21/debian/sysdeps/sparc64.mk 2015-03-16 17:03:45.000000000 +0100
321 +++ glibc-2.21/debian/sysdeps/sparc64.mk 2015-09-13 23:15:20.196334902 +0200
322 @@ -23,7 +23,7 @@
323 ln -s sparc64-linux-gnu/fpu_control.h debian/libc6-dev-sparc/usr/include/
324
325 mkdir -p debian/libc6-dev-sparc/usr/include/sparc64-linux-gnu/gnu
326 -cp -a debian/tmp-sparc/usr/include/gnu/stubs-32.h \
327 +cp -a debian/tmp-sparc/usr/include/sparc64-linux-gnu/gnu/stubs-32.h \
328 debian/libc6-dev-sparc/usr/include/sparc64-linux-gnu/gnu
329
330 mkdir -p debian/libc6-dev-sparc/usr/include/sys
331 diff -ruN orig/glibc-2.21/debian/sysdeps/sparc.mk glibc-2.21/debian/sysdeps/sparc.mk
332 --- orig/glibc-2.21/debian/sysdeps/sparc.mk 2015-03-16 17:03:45.000000000 +0100
333 +++ glibc-2.21/debian/sysdeps/sparc.mk 2015-09-13 23:15:47.767744718 +0200
334 @@ -21,7 +21,7 @@
335 ln -s sparc-linux-gnu/fpu_control.h debian/libc6-dev-sparc64/usr/include/
336
337 mkdir -p debian/libc6-dev-sparc64/usr/include/sparc-linux-gnu/gnu
338 -cp -a debian/tmp-sparc64/usr/include/gnu/stubs-64.h \
339 +cp -a debian/tmp-sparc64/usr/include/sparc-linux-gnu/gnu/stubs-64.h \
340 debian/libc6-dev-sparc64/usr/include/sparc-linux-gnu/gnu
341
342 mkdir -p debian/libc6-dev-sparc64/usr/include/sys
343 diff -ruN orig/glibc-2.21/debian/sysdeps/x32.mk glibc-2.21/debian/sysdeps/x32.mk
344 --- orig/glibc-2.21/debian/sysdeps/x32.mk 2015-03-16 17:03:45.000000000 +0100
345 +++ glibc-2.21/debian/sysdeps/x32.mk 2015-09-13 23:16:25.366939816 +0200
346 @@ -22,7 +22,7 @@
347 ln -s x86_64-linux-gnux32/fpu_control.h debian/libc6-dev-amd64/usr/include/
348
349 mkdir -p debian/libc6-dev-amd64/usr/include/x86_64-linux-gnux32/gnu
350 -cp -a debian/tmp-amd64/usr/include/gnu/stubs-64.h \
351 +cp -a debian/tmp-amd64/usr/include/x86_64-linux-gnux32/gnu/stubs-64.h \
352 debian/libc6-dev-amd64/usr/include/x86_64-linux-gnux32/gnu
353
354 mkdir -p debian/libc6-dev-amd64/usr/include/sys
355 @@ -48,7 +48,7 @@
356 define libc6-dev-i386_extra_pkg_install
357
358 mkdir -p debian/libc6-dev-i386/usr/include/x86_64-linux-gnux32/gnu
359 -cp -a debian/tmp-i386/usr/include/gnu/stubs-32.h \
360 +cp -a debian/tmp-i386/usr/include/x86_64-linux-gnux32/gnu/stubs-32.h \
361 debian/libc6-dev-i386/usr/include/x86_64-linux-gnux32/gnu
362
363 endef
Attached Files
To refer to attachments on a page, use attachment:filename, as shown below in the list of files. Do NOT use the URL of the [get] link, since this is subject to change and can break easily.You are not allowed to attach a file to this page.