Hi all, I have another round of multiarch fixes for gcc, following on to the ones from last July. They're fairly minor; I think the changelog speaks for itself:
* debian/control.m4: add missing Multi-Arch: same for libgcc4; make sure
Multi-Arch: same doesn't get set for libmudflap when building an
Architecture: all cross-compiler package.
* debian/rules2: use $libdir for libiberty.a.
* debian/patches/gcc-multiarch-*.diff: make sure we're using the same
set_multiarch_path definition for all variants.
These are all simply cleanup of the previously accepted changes.
The patch attached includes a bzr bundle that can be applied using bzr-svn
or 'patch' according to preference. My ongoing work is also published here:
https://code.launchpad.net/~vorlon/debian/sid/gcc-4.5/multiarch
(Note: there are later revisions on this branch that should not yet be
applied yet; please only apply up to revision 2457 if you're merging from
the bzr branch...)
Matthias, what are your plans for uploading gcc-4.5 to unstable, now that
squeeze is out? Right now I'm only worrying about gcc-4.5 packages, not
gcc-4.4, with the reasoning that 4.5 should be the default in Debian soon.
Is that the case, or should I prepare gcc-4.4 patches as well?
Please cc: me on replies as I'm not subscribed to debian-gcc.
Thanks,
--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
Ubuntu Developer http://www.debian.org/
slanga...@ubuntu.com vor...@debian.org
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: vor...@debian.org-20110213062512-u07n9g34s23qca2n
# target_branch: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.5
# testament_sha1: b80a072addf0bd8acdf0c660a8cf1a9124d50515
# timestamp: 2011-02-12 23:36:06 -0800
# base_revision_id: svn-v4:6ca36cf4-e1d1-0310-8c6f-\
# e303bb2178ca:branches/sid/gcc-4.5:5029
#
# Begin patch
=== modified file 'debian/changelog'
--- debian/changelog 2011-01-27 12:46:55 +0000
+++ debian/changelog 2011-02-13 06:25:12 +0000
@@ -1,9 +1,18 @@
gcc-4.5 (4.5.2-3) UNRELEASED; urgency=low
+ [ Matthias Klose ]
* Update to SVN 20110127 (r169330) from the gcc-4_5-branch.
- Fix PR rtl-optimization/44469, PR tree-optimization/47411,
PR bootstrap/44699, PR target/44392, PR fortran/47331, PR fortran/47448.
+ [ Steve Langasek ]
+ * debian/control.m4: add missing Multi-Arch: same for libgcc4; make sure
+ Multi-Arch: same doesn't get set for libmudflap when building an
+ Architecture: all cross-compiler package.
+ * debian/rules2: use $libdir for libiberty.a.
+ * debian/patches/gcc-multiarch-*.diff: make sure we're using the same
+ set_multiarch_path definition for all variants.
+
-- Matthias Klose <d...@debian.org> Thu, 27 Jan 2011 13:26:02 +0100
gcc-4.5 (4.5.2-2) experimental; urgency=low
=== modified file 'debian/control.m4'
--- debian/control.m4 2010-10-18 11:13:33 +0000
+++ debian/control.m4 2011-02-13 05:25:34 +0000
@@ -228,6 +228,8 @@
ifenabled(`lib4gcc',`
Package: libgcc4`'LS
Architecture: ifdef(`TARGET',`all',`hppa')
+ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same
+'))`'dnl
Section: ifdef(`TARGET',`devel',`libs')
Priority: ifdef(`TARGET',`extra',required)
Depends: ifdef(`STANDALONEJAVA',`gcj`'PV-base (>= ${gcj:Version})',`BASEDEP'),
${shlibs:Depends}, ${misc:Depends}
@@ -243,6 +245,8 @@
Package: libgcc4-dbg`'LS
Architecture: ifdef(`TARGET',`all',`hppa')
+ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same
+'))`'dnl
Section: debug
Priority: extra
Depends: BASEDEP, libgcc4`'LS (= ${gcc:Version}), ${misc:Depends}
@@ -566,8 +570,8 @@
ifenabled(`libmudf',`
Package: libmudflap`'MF_SO`'LS
Architecture: ifdef(`TARGET',`all',`any')
-ifdef(`MULTIARCH', `Multi-Arch: same
-')`'dnl
+ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same
+'))`'dnl
Section: ifdef(`TARGET',`devel',`libs')
Priority: ifdef(`TARGET',`extra',`PRI(optional)')
Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends}
@@ -577,8 +581,8 @@
Package: libmudflap`'MF_SO-dbg`'LS
Architecture: ifdef(`TARGET',`all',`any')
-ifdef(`MULTIARCH', `Multi-Arch: same
-')`'dnl
+ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same
+'))`'dnl
Section: debug
Priority: extra
Depends: BASEDEP, libmudflap`'MF_SO`'LS (= ${gcc:Version}), ${misc:Depends}
=== modified file 'debian/patches/gcc-multiarch-i686-linaro.diff'
--- debian/patches/gcc-multiarch-i686-linaro.diff 2010-09-14 11:23:22
+0000
+++ debian/patches/gcc-multiarch-i686-linaro.diff 2011-02-13 06:25:12
+0000
@@ -137,7 +137,7 @@
/* Warn about any switches that no pass was interested in. */
for (i = 0; (int) i < n_switches; i++)
-@@ -8553,6 +8562,39 @@
+@@ -8553,6 +8562,27 @@
multilib_os_dir = multilib_dir;
}
@@ -153,24 +153,12 @@
+static void
+set_multiarch_dir (void)
+{
-+ const char *multiarch, *path;
++ const char *path;
+
-+ multiarch = multilib_to_multiarch (multilib_dir);
-+ if (multiarch == NULL)
-+ {
-+ fatal_ice ("\
-+Internal error: no multiarch mapping for multilib (%s)\n\
-+Please submit a full bug report.\n\
-+See %s for instructions.",
-+ multilib_dir ? multilib_dir : multilib_defaults, bug_report_url);
-+ }
-+ else if (multiarch)
-+ {
-+ path = concat (STANDARD_STARTFILE_PREFIX_2, multiarch,
-+ dir_separator_str, NULL);
-+ add_prefix (&startfile_prefixes, path, NULL,
-+ PREFIX_PRIORITY_LAST, 0, 1);
-+ }
++ path = concat (STANDARD_STARTFILE_PREFIX_2, MULTIARCH_DEFAULTS,
++ dir_separator_str, NULL);
++ add_prefix (&startfile_prefixes, path, NULL,
++ PREFIX_PRIORITY_LAST, 0, 1);
+}
+#endif
+
=== modified file 'debian/patches/gcc-multiarch-i686-trunk.diff'
--- debian/patches/gcc-multiarch-i686-trunk.diff 2010-11-16 07:11:36
+0000
+++ debian/patches/gcc-multiarch-i686-trunk.diff 2011-02-13 06:25:12
+0000
@@ -129,7 +129,7 @@
/* Warn about any switches that no pass was interested in. */
for (i = 0; (int) i < n_switches; i++)
-@@ -8409,6 +8418,39 @@
+@@ -8409,6 +8418,27 @@
multilib_os_dir = multilib_dir;
}
@@ -145,24 +145,12 @@
+static void
+set_multiarch_dir (void)
+{
-+ const char *multiarch, *path;
++ const char *path;
+
-+ multiarch = multilib_to_multiarch (multilib_dir);
-+ if (multiarch == NULL)
-+ {
-+ internal_error ("\
-+Internal error: no multiarch mapping for multilib (%s)\n\
-+Please submit a full bug report.\n\
-+See %s for instructions.",
-+ multilib_dir ? multilib_dir : multilib_defaults, bug_report_url);
-+ }
-+ else if (multiarch)
-+ {
-+ path = concat (STANDARD_STARTFILE_PREFIX_2, multiarch,
-+ dir_separator_str, NULL);
-+ add_prefix (&startfile_prefixes, path, NULL,
-+ PREFIX_PRIORITY_LAST, 0, 1);
-+ }
++ path = concat (STANDARD_STARTFILE_PREFIX_2, MULTIARCH_DEFAULTS,
++ dir_separator_str, NULL);
++ add_prefix (&startfile_prefixes, path, NULL,
++ PREFIX_PRIORITY_LAST, 0, 1);
+}
+#endif
+
=== modified file 'debian/patches/gcc-multiarch-linaro.diff'
--- debian/patches/gcc-multiarch-linaro.diff 2010-09-14 11:23:22 +0000
+++ debian/patches/gcc-multiarch-linaro.diff 2011-02-13 06:25:12 +0000
@@ -137,7 +137,7 @@
/* Warn about any switches that no pass was interested in. */
for (i = 0; (int) i < n_switches; i++)
-@@ -8553,6 +8562,39 @@
+@@ -8553,6 +8562,27 @@
multilib_os_dir = multilib_dir;
}
@@ -153,24 +153,12 @@
+static void
+set_multiarch_dir (void)
+{
-+ const char *multiarch, *path;
++ const char *path;
+
-+ multiarch = multilib_to_multiarch (multilib_dir);
-+ if (multiarch == NULL)
-+ {
-+ fatal_ice ("\
-+Internal error: no multiarch mapping for multilib (%s)\n\
-+Please submit a full bug report.\n\
-+See %s for instructions.",
-+ multilib_dir ? multilib_dir : multilib_defaults, bug_report_url);
-+ }
-+ else if (multiarch)
-+ {
-+ path = concat (STANDARD_STARTFILE_PREFIX_2, multiarch,
-+ dir_separator_str, NULL);
-+ add_prefix (&startfile_prefixes, path, NULL,
-+ PREFIX_PRIORITY_LAST, 0, 1);
-+ }
++ path = concat (STANDARD_STARTFILE_PREFIX_2, MULTIARCH_DEFAULTS,
++ dir_separator_str, NULL);
++ add_prefix (&startfile_prefixes, path, NULL,
++ PREFIX_PRIORITY_LAST, 0, 1);
+}
+#endif
+
=== modified file 'debian/patches/gcc-multiarch-trunk.diff'
--- debian/patches/gcc-multiarch-trunk.diff 2010-11-16 07:11:36 +0000
+++ debian/patches/gcc-multiarch-trunk.diff 2011-02-13 06:25:12 +0000
@@ -129,7 +129,7 @@
/* Warn about any switches that no pass was interested in. */
for (i = 0; (int) i < n_switches; i++)
-@@ -8409,6 +8418,39 @@
+@@ -8409,6 +8418,27 @@
multilib_os_dir = multilib_dir;
}
@@ -145,24 +145,12 @@
+static void
+set_multiarch_dir (void)
+{
-+ const char *multiarch, *path;
++ const char *path;
+
-+ multiarch = multilib_to_multiarch (multilib_dir);
-+ if (multiarch == NULL)
-+ {
-+ internal_error ("\
-+Internal error: no multiarch mapping for multilib (%s)\n\
-+Please submit a full bug report.\n\
-+See %s for instructions.",
-+ multilib_dir ? multilib_dir : multilib_defaults, bug_report_url);
-+ }
-+ else if (multiarch)
-+ {
-+ path = concat (STANDARD_STARTFILE_PREFIX_2, multiarch,
-+ dir_separator_str, NULL);
-+ add_prefix (&startfile_prefixes, path, NULL,
-+ PREFIX_PRIORITY_LAST, 0, 1);
-+ }
++ path = concat (STANDARD_STARTFILE_PREFIX_2, MULTIARCH_DEFAULTS,
++ dir_separator_str, NULL);
++ add_prefix (&startfile_prefixes, path, NULL,
++ PREFIX_PRIORITY_LAST, 0, 1);
+}
+#endif
+
=== modified file 'debian/rules2'
--- debian/rules2 2011-01-20 00:34:38 +0000
+++ debian/rules2 2011-02-13 05:29:18 +0000
@@ -1688,7 +1688,7 @@
: # remove files not needed from the hppa64 build
rm -rf $(d)/$(PF)/share/info
rm -rf $(d)/$(PF)/share/man
- rm -f $(d)/$(PF)/lib/libiberty.a
+ rm -f $(d)/$(PF)/$(libdir)/libiberty.a
rm -f $(d)/$(PF)/bin/*{gcov,gccbug,gcc}
rm -rf $(d)/$(PF)/hppa64-linux-gnu/include
@@ -1739,7 +1739,7 @@
rm -rf $(d)/$(PF)/info $(d)/$(PF)/share/info
rm -rf $(d)/$(PF)/man $(d)/$(PF)/share/man
rm -rf $(d)/$(PF)/$(libdir)/gcc/spu/$(GCC_VERSION)/plugin
- rm -f $(d)/$(PF)/lib/libiberty.a
+ rm -f $(d)/$(PF)/$(libdir)/libiberty.a
rm -f $(d)/$(PF)/bin/*{gcov,gccbug,gcc}
# FIXME
@@ -2103,7 +2103,7 @@
: # remove files not needed
rm -rf $(d_spu)/$(PF)/info
# rm -rf $(d_spu)/$(PF)/man
- rm -f $(d_spu)/$(PF)/lib/libiberty.a
+ rm -f $(d_spu)/$(PF)/$(libdir)/libiberty.a
rm -f $(d_spu)/$(PF)/bin/*{gcov,gccbug,gcc}
# rm -rf $(d_spu)/$(PF)/spu/include
# Begin bundle
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
signature.asc
Description: Digital signature
