[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#744265: src:gcc-4.9: FTCBFS for arm64 during application of cross-ma-install-location.diff due to mudflap



Package: src:gcc-4.9
Version: 4.9-20140411-1
Severity: normal
Tags: patch
User: helmutg@subdivi.de
Usertags: rebootstrap

Hi doko,

Build configuration: with_deps_on_target_arch_pkgs=yes DEB_TARGET_ARCH=arm64

Tail of build-log:

Applying patch cross-ma-install-location.diff
patching file src/boehm-gc/configure.ac
patching file src/libada/configure.ac
patching file src/libffi/configure.ac
Hunk #1 succeeded at 495 (offset 9 lines).
patching file src/libgcc/configure.ac
Hunk #1 succeeded at 95 (offset 10 lines).
Hunk #2 succeeded at 139 (offset 10 lines).
patching file src/libgfortran/configure.ac
patching file src/libgo/configure.ac
Hunk #1 succeeded at 80 (offset 3 lines).
patching file src/libgomp/configure.ac
patching file src/libitm/configure.ac
patching file src/libjava/configure.ac
Hunk #1 succeeded at 1571 (offset 5 lines).
can't find file to patch at input line 190
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- a/src/libmudflap/configure.ac
|+++ b/src/libmudflap/configure.ac
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
patching file src/libobjc/configure.ac
Hunk #1 succeeded at 108 (offset -1 lines).
patching file src/libquadmath/configure.ac
patching file src/libssp/configure.ac
patching file src/libstdc++-v3/acinclude.m4
patching file src/zlib/configure.ac
patching file src/libatomic/configure.ac
patching file src/libsanitizer/configure.ac
Hunk #1 succeeded at 40 (offset 2 lines).
Patch cross-ma-install-location.diff does not apply (enforce with -f)
make: *** [stamps/02-patch-stamp] Error 1
dpkg-buildpackage: error: debian/rules control gave error exit status 2

Seems like another mention of mudflap that should be removed. Patch
attached.

Helmut
diff -u gcc-4.9-4.9-20140411/debian/changelog gcc-4.9-4.9-20140411/debian/changelog
--- gcc-4.9-4.9-20140411/debian/changelog
+++ gcc-4.9-4.9-20140411/debian/changelog
@@ -1,3 +1,11 @@
+gcc-4.9 (4.9-20140411-1.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Remove mentions to mudflap from patches/cross-ma-install-location.diff,
+    because there is no mudflap in gcc-4.9 anymore. Closes: #-1
+
+ -- Helmut Grohne <helmut@subdivi.de>  Sat, 12 Apr 2014 10:29:18 +0200
+
 gcc-4.9 (4.9-20140411-1) unstable; urgency=medium
 
   * GCC 4.9.0 release candidate 1.
diff -u gcc-4.9-4.9-20140411/debian/patches/cross-ma-install-location.diff gcc-4.9-4.9-20140411/debian/patches/cross-ma-install-location.diff
--- gcc-4.9-4.9-20140411/debian/patches/cross-ma-install-location.diff
+++ gcc-4.9-4.9-20140411/debian/patches/cross-ma-install-location.diff
@@ -185,26 +185,6 @@
      multi_os_directory=`$CC -print-multi-os-directory`
      case $multi_os_directory in
        .) toolexeclibdir=$toolexecmainlibdir ;; # Avoid trailing /.
---- a/src/libmudflap/configure.ac
-+++ b/src/libmudflap/configure.ac
-@@ -157,15 +157,8 @@
-     toolexeclibdir='$(toolexecdir)/$(gcc_version)$(MULTISUBDIR)'
-     ;;
-   no)
--    if test -n "$with_cross_host" &&
--       test x"$with_cross_host" != x"no"; then
--      # Install a library built with a cross compiler in tooldir, not libdir.
--      toolexecdir='$(exec_prefix)/$(target_alias)'
--      toolexeclibdir='$(toolexecdir)/lib'
--    else
--      toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
--      toolexeclibdir='$(libdir)'
--    fi
-+    toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
-+    toolexeclibdir='$(libdir)'
-     multi_os_directory=`$CC -print-multi-os-directory`
-     case $multi_os_directory in
-       .) ;; # Avoid trailing /.
 --- a/src/libobjc/configure.ac
 +++ b/src/libobjc/configure.ac
 @@ -109,15 +109,8 @@

Reply to: