Bug#783372: src:gcc-5: fix cross build with gnat
On Sun, 26 Apr 2015 21:32:53 +0800 YunQiang Su <wzssyqa@gmail.com> wrote:
> Package: src:gcc-5
> Version: 5.1~rc1-1
>
> These 2 patches fix cross build of gnat.
> The patch for Bug:#782257 should be applied first.
>
>
> debian/control.m4 | 69 ++++++++++++++++++++++++++++————————
>
> Enable gccbase or gccxbase for separated src:gnat-Version.
>
> >-Breaks: gnat (<< 4.6.1), dh-ada-library (<< 6.0), gnat-4.6-base (= 4.6.4-2),
> >- gnat-4.9-base (= 4.9-20140330-1)
> >-Replaces: gnat (<< 4.6.1), dh-ada-library (<< 6.0), gnat-4.6-base (= 4.6.4-2),
> >- gnat-4.9-base (= 4.9-20140330-1)
> >+Breaks: gnat (<< 4.6.1), dh-ada-library (<< 6.0), gnat-4.6-base,
> >+ gnat-4.9-base
> >+Replaces: gnat (<< 4.6.1), dh-ada-library (<< 6.0), gnat-4.6-base,
> >+ gnat-4.9-base
>
> Breaks all version gnat-4.6-base and gcc-4.9-base, as the patch for Bug:#782257 use command
> name as gnat*-5 instead of gnat*.
>
>
> debian/rules.conf | 9 +++++-
> debian/rules.d/binary-ada.mk | 7 +++—
>
> > $(binary_stamp)-gnatbase: $(install_stamp)
> >+ifeq ($(PKGSOURCE),gnat-$(BASE_VERSION))
> > dh_testdir
> > dh_testroot
> > dh_installdocs -p$(p_gbase) debian/README.gnat debian/README.maintainers
> > : # $(p_gbase)
> >-ifeq ($(PKGSOURCE),gnat-$(BASE_VERSION))
> > mkdir -p $(d_gbase)/$(docdir)/$(p_xbase)
> > ln -sf ../$(p_gbase) $(d_gbase)/$(docdir)/$(p_xbase)/Ada
> >-endif
> > dh_installchangelogs -p$(p_gbase) src/gcc/ada/ChangeLog
> > dh_compress -p$(p_gbase)
> > dh_fixperms -p$(p_gbase)
> >@@ -88,6 +88,7 @@ endif
> > dh_installdeb -p$(p_gbase)
> > dh_md5sums -p$(p_gbase)
> > dh_builddeb -p$(p_gbase)
> >+endif
> > touch $@
>
> only when source name is gnat-$(BASE_VERSION), gnatbase is needed,
> so use ifeq ($(PKGSOURCE),gnat-$(BASE_VERSION)) to quote the whole
> snap of code.
>
> debian/rules.defs | 13 +++++++—
>
>
>
>
> debian/patches/ada-gnattools-cross.diff | 743 +++++++++++
> debian/patches/ada-libgnatprj.diff | 1312 +++++--------------
> debian/patches/ada-libgnatvsn.diff | 941 ++------------
> debian/patches/ada-link-lib.diff | 2144 ++++++++++---------------------
> debian/patches/ada-mips64.diff
the former patch will be applied to the wrong position, aka the mips/el.
so we have 2 hook now, to make sure the patch be applied correctly.
Reply to: