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

Bug#742606: cross-ma-install-location.diff: src/libmudflap/configure.ac No file to patch



Control: tags -1 + patch

On Tue, Mar 25, 2014 at 07:47:40PM +0800, Yunqiang Su wrote:
> In the source of gcc-4.9, it seems that it have no src/libmudflap any more,
> while in cross-ma-install-location.diff, there is still some snap about it.
> 
> Please consider drop it.

For instance using the attached patch.

Helmut
diff -u gcc-4.9-4.9-20140322/debian/changelog gcc-4.9-4.9-20140322/debian/changelog
--- gcc-4.9-4.9-20140322/debian/changelog
+++ gcc-4.9-4.9-20140322/debian/changelog
@@ -1,3 +1,11 @@
+gcc-4.9 (4.9-20140322-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Drop mudflap from cross-install-location.diff since mudflap was removed
+    from gcc 4.9. Closes: #742606
+
+ -- Helmut Grohne <helmut@subdivi.de>  Wed, 26 Mar 2014 19:18:38 +0100
+
 gcc-4.9 (4.9-20140322-1) experimental; urgency=medium
 
   * Package GCC 4.9 snapshot 20140322.
diff -u gcc-4.9-4.9-20140322/debian/patches/cross-install-location.diff gcc-4.9-4.9-20140322/debian/patches/cross-install-location.diff
--- gcc-4.9-4.9-20140322/debian/patches/cross-install-location.diff
+++ gcc-4.9-4.9-20140322/debian/patches/cross-install-location.diff
@@ -1,25 +1,3 @@
---- a/src/libmudflap/Makefile.in	2012-12-08 08:32:41.301881153 +0100
-+++ b/src/libmudflap/Makefile.in	2012-12-08 08:58:29.281874520 +0100
-@@ -269,7 +269,7 @@
- @LIBMUDFLAPTH_FALSE@libmudflapth = 
- @LIBMUDFLAPTH_TRUE@libmudflapth = libmudflapth.la
- toolexeclib_LTLIBRARIES = libmudflap.la $(libmudflapth)
--libsubincludedir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/include
-+libsubincludedir = $(libdir)/gcc-cross/$(target_noncanonical)/$(gcc_version)/include
- nobase_libsubinclude_HEADERS = mf-runtime.h
- libmudflap_la_SOURCES = \
- 	mf-runtime.c \
---- a/src/libmudflap/Makefile.am	2012-12-08 08:32:41.301881153 +0100
-+++ b/src/libmudflap/Makefile.am	2012-12-08 08:58:04.633876182 +0100
-@@ -23,7 +23,7 @@
- 
- toolexeclib_LTLIBRARIES = libmudflap.la $(libmudflapth)
- target_noncanonical = @target_noncanonical@
--libsubincludedir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/include
-+libsubincludedir = $(libdir)/gcc-cross/$(target_noncanonical)/$(gcc_version)/include
- nobase_libsubinclude_HEADERS = mf-runtime.h
- 
- 
 --- a/src/fixincludes/Makefile.in	2011-01-03 21:52:22.000000000 +0100
 +++ b/src/fixincludes/Makefile.in	2012-12-08 08:53:27.029874709 +0100
 @@ -52,9 +52,9 @@

Reply to: