Re: Merge gnat back to gcc
YunQiang Su <wzssyqa@gmail.com> writes:
> I update this patch, and tested it in 3 situations:
>
> 1. normal native build
> in a chroot, with dpkg-buildpackage -B, it works well
> while build it with pbuilder, I met this problem
> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=713170
> 2. cross build, aka dpkg-buildpackage -amips64el
> it works well with in a chroot env.
> 3. cross build with target != host, and with_deps_on_target_arch_pkgs=yes
> it also works well.
Hello,
Sorry for not replying earlier.
We will not merge gnat-4.9 into gcc-4.9; we will keep them separate
source packages. This is because gnat-4.9 has additional build
dependencies that should not be imposed on gcc-4.9. Consequently, the
changes you reverted in comperr.adb, gnatlink.adb
(i.e. debiab/patches/ada-gcc-name.diff) will be retained.
In your patch, I see changes to src/gcc/ada/osint.adb. Could you
explain why you needed these changes on mips64el? I cannot see why this
change is needed.
Your debdiff mangled the changes you may have made:
--- gcc-4.9-4.9.2/debian/patches/ada-libgnatprj.diff
+++ gcc-4.9-4.9.2/debian/patches/ada-libgnatprj.diff
@@ -8,10 +8,10 @@
# !!! Must be applied after ada-libgnatvsn.dpatch
-Index: b/src/gcc/ada/gcc-interface/config-lang.in
+Index: gcc-4.9-4.9.2/src/gcc/ada/gcc-interface/config-lang.in
===================================================================
---- a/src/gcc/ada/gcc-interface/config-lang.in
-+++ b/src/gcc/ada/gcc-interface/config-lang.in
+--- gcc-4.9-4.9.2.orig/src/gcc/ada/gcc-interface/config-lang.in 2014-11-10 03:22:59.713708557 +0800
++++ gcc-4.9-4.9.2/src/gcc/ada/gcc-interface/config-lang.in 2014-11-10 03:22:59.705708557 +0800
@@ -34,8 +34,8 @@
outputs="ada/gcc-interface/Makefile ada/Makefile"
@@ -23,184 +23,11 @@
# Ada is not enabled by default for the time being.
build_by_default=no
-Index: b/src/gnattools/Makefile.in
+Index: gcc-4.9-4.9.2/src/libgnatprj/Makefile.in
===================================================================
so I cannot see what you changed in src/gnattools/Makefile.in. And it
seems you completely removed src/gnattools/Makefile.in from
debian/patches/ada-libgnatvsn.diff later on; why?
The same applies to the rest of your *huge* patch. It would be much
more efficient if you could:
- work with two separate source packages: gcc-4.9 and gnat-4.9
- send small, focused patches that apply to files under debian/ and
nothing else. A debdiff is too big for us to review.
- eliminate noise from your patches, such as:
@@ -1527,10 +292,10 @@
fi
AC_ARG_ENABLE(libssp,
-Index: b/src/libgnatprj/configure.ac
+Index: gcc-4.9-4.9.2/src/libgnatprj/configure.ac
===================================================================
---- /dev/null
-+++ b/src/libgnatprj/configure.ac
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gcc-4.9-4.9.2/src/libgnatprj/configure.ac 2014-11-10 03:22:59.709708557 +0800
@@ -0,0 +1,146 @@
+# Configure script for libada.
+# Copyright 2003, 2004 Free Software Foundation, Inc.
--
Ludovic Brenta.
Reply to: