diff options
| author | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2015-05-16 14:29:54 +0000 |
|---|---|---|
| committer | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2015-05-16 14:29:54 +0000 |
| commit | 481c9cb247ce586b94f51f6727c029fd277cd534 (patch) | |
| tree | ed21ec9fe742dfa489fa061796f117e236308592 | |
| parent | 9c9fe022200029d18016f50e9a068f809b6ebd89 (diff) | |
| download | gcc-5-481c9cb247ce586b94f51f6727c029fd277cd534.tar.gz | |
* Remove reference to .ico file in NEWS.html.
* Fix gcc's dependency on libcc1-0 for native builds.
* Fix stripping the rpath when cross-building cross compilers.
git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-5@8040 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
| -rw-r--r-- | debian/NEWS.html | 1 | ||||
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/rules.conf | 2 | ||||
| -rw-r--r-- | debian/rules2 | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/debian/NEWS.html b/debian/NEWS.html index 69aac59..43981ed 100644 --- a/debian/NEWS.html +++ b/debian/NEWS.html @@ -23,7 +23,6 @@ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <link rev="made" href="mailto:gcc@gcc.gnu.org" /> - <link rel="shortcut icon" href="https://gcc.gnu.org/favicon.ico" /> <link rel="stylesheet" type="text/css" href="https://gcc.gnu.org/gcc.css" /> <title> diff --git a/debian/changelog b/debian/changelog index c6dab24..ab3874c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ gcc-5 (5.1.1-6) UNRELEASED; urgency=medium * Update to SVN 20150513 (r223155, 5.1.1) from the gcc-5-branch. * Don't build gdc-multilib on armel. * Remove old CFLAGS/LDFLAGS settings to build gdc. + * Remove reference to .ico file in NEWS.html. + * Fix gcc's dependency on libcc1-0 for native builds. + * Fix stripping the rpath when cross-building cross compilers. -- Matthias Klose <doko@debian.org> Sun, 10 May 2015 02:01:20 +0200 diff --git a/debian/rules.conf b/debian/rules.conf index 0ce8a00..ce6a387 100644 --- a/debian/rules.conf +++ b/debian/rules.conf @@ -1204,7 +1204,7 @@ ifeq ($(with_cc1),yes) echo 'dep:libcc1=libcc1-$(CC1_SONAME) (>= $(GCC_VERSION))' \ >> debian/substvars.local.tmp else - echo 'dep:libcc1=libcc1-$(CC1_SONAME) (>= $${gcc:Version})' + echo 'dep:libcc1=libcc1-$(CC1_SONAME) (>= $${gcc:Version})' \ >> debian/substvars.local.tmp endif endif diff --git a/debian/rules2 b/debian/rules2 index 6824df5..9b9e0dd 100644 --- a/debian/rules2 +++ b/debian/rules2 @@ -2186,7 +2186,7 @@ endif for i in $$(chrpath -k $(d)/$(PF)/bin/* $(d)/$(PFL)/lib*/lib*.so.* \ $(d)/$(gcc_lib_dir)/plugin/* \ $(if $(filter $(with_multiarch_lib),yes), \ - $(d)/$(PF)/lib/$(DEB_HOST_MULTIARCH)/lib*.so.*) \ + $(d)/$(PF)/lib/$(DEB_TARGET_MULTIARCH)/lib*.so.*) \ $(d)/$(PF)/lib*/gcj$(pkg_ver)*/lib*.so.* \ 2>/dev/null | awk -F: '/RPATH=/ {print $$1}'); \ do \ |