On 2017-07-01 05:54 +0200, Cyril Brulebois wrote: > Control: tag -1 moreinfo
[sorry for slow response - missed this message] > Wookey <woo...@debian.org> (2017-06-30): > > cross-gcc-dev has to be in very close sync with the version of gcc in > > order for it's patches to apply. The cross-gcc that made it into > > stable was prepared against gcc-6 6.3.0-2 whilst 6.3.0-18 is the > > version that was released in stable, so a minor update to the patches > > is needed to make this package useful. > > The usual requirement is to fix bugs in unstable/testing first; that > doesn't seem to be the case as of yet. The bug was fixed in cross-gcc 128 in unstable. However that has now moved on to 135. And in fact that still applies applies correctly to the gcc-6 in stable (gcc and cross-gcc versions are quite tightly tied, but not exactly per-version). So this fix is in unstable. We can just use v135 in stretch if that is preferable? > > See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=865493 > > There probably should be a Closes in the proposed changelog. OK. I didn't know the number at time of patch creation. > > Attached is the debdiff for an upload versioned as > > cross-gcc_113+deb9u1 Is that OK to upload? > > > diff -Nru cross-gcc-113/debian/changelog > > cross-gcc-113+deb9u1/debian/changelog > > --- cross-gcc-113/debian/changelog 2017-01-01 01:36:10.000000000 +0000 > > +++ cross-gcc-113+deb9u1/debian/changelog 2017-06-22 02:44:00.000000000 > > +0100 > > @@ -1,3 +1,9 @@ > > +cross-gcc (113+deb9u1) stable; urgency=medium > > Please target stretch instead of stable. > > > + * Fixup patches for gcc 6.3.0-18 in stable > > There's a single patch being fixed up? Correct, but all the patches were checked against that gcc version, so I think that changelog message is appropriate. I clarified in updated patch. New patch attached with suggested changes. Is this OK? Wookey -- Principal hats: Linaro, Debian, Wookware, ARM http://wookware.org/
diff -Nru cross-gcc-113/debian/changelog cross-gcc-113+deb9u1/debian/changelog
--- cross-gcc-113/debian/changelog 2017-01-01 01:36:10.000000000 +0000
+++ cross-gcc-113+deb9u1/debian/changelog 2017-06-22 01:44:00.000000000 +0000
@@ -1,3 +1,9 @@
+cross-gcc (113+deb9u1) stretch; urgency=medium
+
+ * Fixup outdated patch for gcc 6.3.0-18 in stable (Closes: 865493)
+
+ -- Wookey <woo...@debian.org> Thu, 22 Jun 2017 01:44:00 +0000
+
cross-gcc (113) unstable; urgency=medium
* rebuild for 6.3.0-2
diff -Nru cross-gcc-113/patches/gcc-6/0010-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch cross-gcc-113+deb9u1/patches/gcc-6/0010-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch
--- cross-gcc-113/patches/gcc-6/0010-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch 2017-01-01 01:36:10.000000000 +0000
+++ cross-gcc-113+deb9u1/patches/gcc-6/0010-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch 2017-06-22 01:44:00.000000000 +0000
@@ -26,8 +26,8 @@
+define(`SOFTBASEDEP', `BASEPKG (>= ${gcc:SoftVersion})')
ifdef(`TARGET',`
--define(`BASELDEP', `gcc`'PV-cross-base`'GCC_PORTS_BUILD (= ${gcc:Version})')
--define(`SOFTBASELDEP', `gcc`'PV-cross-base`'GCC_PORTS_BUILD (>= ${gcc:SoftVersion})')
+-define(`BASELDEP', `gcc`'PV`'ifelse(CROSS_ARCH,`all',`-cross')-base`'GCC_PORTS_BUILD (= ${gcc:Version})')
+-define(`SOFTBASELDEP', `gcc`'PV`'ifelse(CROSS_ARCH, `all',`-cross')-base`'GCC_PORTS_BUILD (>= ${gcc:SoftVersion})')
+define(`BASELDEP', `BASEPKG (>= ${gcc:Version})')
+define(`SOFTBASELDEP', `BASEPKG (>= ${gcc:SoftVersion})')
',`dnl
@@ -42,6 +42,3 @@
Architecture: any
Multi-Arch: same
Section: ifdef(`TARGET',`devel',`libs')
---
-2.11.0
-
signature.asc
Description: Digital signature
