Re: [PATCH] [round 3] [All done :-)] Upstreaming Debian patches

On Mon, 6 Jun 2016, Christian Seiler wrote:

> On 06/06/2016 02:18 PM, Felix von Leitner wrote:
> > OK, I think I imported them all. Please check if I missed something!
>=20
> I can verify that that's all, thank you very much!

Out of the Debian patches, this part is still missing
and needed upstream:

--- a/diet.c
+++ b/diet.c
@@ -214,8 +214,12 @@ int main(int argc,char *argv[]) {
       shortplatform=3D"parisc";
 #endif
 #ifdef __x86_64__
+#ifdef __ILP32__
+      shortplatform=3D(m=3D=3D32?"i386":(m=3D=3D64?"x86_64":"x32"));
+#else
       shortplatform=3D(m=3D=3D32?"i386":(m=3D=3D33?"x32":"x86_64"));
 #endif
+#endif
 #ifdef __ia64__
       shortplatform=3D"ia64";
 #endif

debian/patches/debian/multiarch.diff should also be considered,
in a way that it is inert when the distro does not use Multi-Arch.
Note that, even on M-A enabled Debian, dashL_debian_old must NOT
be retired; in the regular toolchain (system gcc/glibc), /usr/lib
is still searched as well, it=E2=80=99s just that Debian packages don=E2=80=
=99t
install anything into that any more eventually, but it will never
be delisted as search path.

debian/patches/debian/dont-strip.diff could probably go away if
upstream introduces a way to tell the Makefile to not strip but
not define -DDEBUG=E2=80=A6 actually, it doesn=E2=80=99t do that, so Debian=
 can
probably just remove that patch and convert the debian/rules line
=09ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
into an always-true condition, or even inline the DEBUG=3D1 below.

debian/patches/debian/hardening.diff is probably wrong; CFLAGS
should be provided by debian/rules, not created in the Makefile.
Use DEB_BUILD_MAINT_OPTIONS, dpkg-buildflags, et al. for that.

debian/patches/debian/sparc32-mcpu-v9.diff is a workaround for
a bug in recent Linux/GCC versions to not support sparc32 CPUs
in the sparc32 architecture any more (don=E2=80=99t laugh), and thus
should be kept Debian-specific (for as long as there=E2=80=99s a sparc32
port=E2=80=A6 but it=E2=80=99s useful, I can probably take contemporary die=
tlibc
and use it with Linux 2.0, so=E2=80=A6).

Just my 2=C2=A2 as previous dietlibc Debian maintainer.

bye,
//mirabilos
--=20
tarent solutions GmbH
Rochusstra=C3=9Fe 2-4, D-53123 Bonn =E2=80=A2 http://www.tarent.de/
Tel: +49 228 54881-393 =E2=80=A2 Fax: +49 228 54881-235
HRB 5168 (AG Bonn) =E2=80=A2 USt-ID (VAT): DE122264941
Gesch=C3=A4ftsf=C3=BChrer: Dr. Stefan Barth, Kai Ebenrett, Boris Esser, Ale=
xander Steeg