summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordoko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>2014-04-23 05:27:17 +0000
committerdoko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>2014-04-23 05:27:17 +0000
commit6f708cb6f66bc8327f10ee98f49c34615a868902 (patch)
tree5f243400535131a5fa9e9185ad64ebc079402bd5
parentcfc0f110435907a5b5929f2f42e8629bce1050f2 (diff)
downloadgcc-48-6f708cb6f66bc8327f10ee98f49c34615a868902.tar.gz
* Remove more mudflap left overs. Closes: #742606.
git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.8@7292 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/cross-ma-install-location.diff20
2 files changed, 1 insertions, 20 deletions
diff --git a/debian/changelog b/debian/changelog
index c94ac11..3c1ff97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ gcc-4.8 (4.8.2-20) UNRELEASED; urgency=medium
* Explicitly configure with --disable-multilib on sparc64 when no
multilibs are requested (Helmut Grohne). Closes: #743342.
* Update powerpcspe patches for the branch (Helmut Grohne). Closes: #743718.
+ * Remove more mudflap left overs. Closes: #742606.
-- Matthias Klose <doko@debian.org> Mon, 07 Apr 2014 16:22:30 +0200
diff --git a/debian/patches/cross-ma-install-location.diff b/debian/patches/cross-ma-install-location.diff
index eb32082..6cc923d 100644
--- a/debian/patches/cross-ma-install-location.diff
+++ b/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 @@