diff options
| author | Khem Raj <raj.khem@gmail.com> | 2017-10-14 08:48:57 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-14 07:54:06 -0700 |
| commit | 42c804e351ac5261be7fb3d0b684ddf1ebb6c645 (patch) | |
| tree | 6529682b2abea79484c0adacc18c38a4bc44b16f /meta/recipes-devtools/gcc/gcc-6.4/0036-libcc1-fix-libcc1-s-install-path-and-rpath.patch | |
| parent | 5ed61141e10b13bb9731c0d6398d3f30d6f7a65d (diff) | |
| download | poky-42c804e351ac5261be7fb3d0b684ddf1ebb6c645.tar.gz | |
gcc6: Upgrade to 6.4
Cherry-picked from oe-core master 7874fa86cb583fe6a178b95ead09430486197197
(From OE-Core rev: 86ffec0971b521bdaf9b031005bd3561ff97bdf8)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc-6.4/0036-libcc1-fix-libcc1-s-install-path-and-rpath.patch')
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-6.4/0036-libcc1-fix-libcc1-s-install-path-and-rpath.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-6.4/0036-libcc1-fix-libcc1-s-install-path-and-rpath.patch b/meta/recipes-devtools/gcc/gcc-6.4/0036-libcc1-fix-libcc1-s-install-path-and-rpath.patch new file mode 100644 index 0000000000..f89a8860f9 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-6.4/0036-libcc1-fix-libcc1-s-install-path-and-rpath.patch | |||
| @@ -0,0 +1,54 @@ | |||
| 1 | From f4d3c8e970d42a43cd3d2f751e13324efa936ff8 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
| 3 | Date: Sun, 5 Jul 2015 20:25:18 -0700 | ||
| 4 | Subject: [PATCH 36/46] libcc1: fix libcc1's install path and rpath | ||
| 5 | |||
| 6 | * Install libcc1.so and libcc1plugin.so into | ||
| 7 | $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version), as what we | ||
| 8 | had done to lto-plugin. | ||
| 9 | * Fix bad RPATH iussue: | ||
| 10 | gcc-5.2.0: package gcc-plugins contains bad RPATH /patht/to/tmp/sysroots/qemux86-64/usr/lib64/../lib64 in file | ||
| 11 | /path/to/gcc/5.2.0-r0/packages-split/gcc-plugins/usr/lib64/gcc/x86_64-poky-linux/5.2.0/plugin/libcc1plugin.so.0.0.0 | ||
| 12 | [rpaths] | ||
| 13 | |||
| 14 | Upstream-Status: Inappropriate [OE configuration] | ||
| 15 | |||
| 16 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
| 17 | --- | ||
| 18 | libcc1/Makefile.am | 4 ++-- | ||
| 19 | libcc1/Makefile.in | 4 ++-- | ||
| 20 | 2 files changed, 4 insertions(+), 4 deletions(-) | ||
| 21 | |||
| 22 | diff --git a/libcc1/Makefile.am b/libcc1/Makefile.am | ||
| 23 | index b40820b..32930c5 100644 | ||
| 24 | --- a/libcc1/Makefile.am | ||
| 25 | +++ b/libcc1/Makefile.am | ||
| 26 | @@ -35,8 +35,8 @@ libiberty = $(if $(wildcard $(libiberty_noasan)),$(Wc)$(libiberty_noasan), \ | ||
| 27 | $(Wc)$(libiberty_normal))) | ||
| 28 | libiberty_dep = $(patsubst $(Wc)%,%,$(libiberty)) | ||
| 29 | |||
| 30 | -plugindir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/plugin | ||
| 31 | -cc1libdir = $(libdir)/$(libsuffix) | ||
| 32 | +cc1libdir = $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version) | ||
| 33 | +plugindir = $(cc1libdir) | ||
| 34 | |||
| 35 | if ENABLE_PLUGIN | ||
| 36 | plugin_LTLIBRARIES = libcc1plugin.la | ||
| 37 | diff --git a/libcc1/Makefile.in b/libcc1/Makefile.in | ||
| 38 | index 79d39d3..227ec22 100644 | ||
| 39 | --- a/libcc1/Makefile.in | ||
| 40 | +++ b/libcc1/Makefile.in | ||
| 41 | @@ -291,8 +291,8 @@ libiberty = $(if $(wildcard $(libiberty_noasan)),$(Wc)$(libiberty_noasan), \ | ||
| 42 | $(Wc)$(libiberty_normal))) | ||
| 43 | |||
| 44 | libiberty_dep = $(patsubst $(Wc)%,%,$(libiberty)) | ||
| 45 | -plugindir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/plugin | ||
| 46 | -cc1libdir = $(libdir)/$(libsuffix) | ||
| 47 | +cc1libdir = $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version) | ||
| 48 | +plugindir = $(cc1libdir) | ||
| 49 | @ENABLE_PLUGIN_TRUE@plugin_LTLIBRARIES = libcc1plugin.la | ||
| 50 | @ENABLE_PLUGIN_TRUE@cc1lib_LTLIBRARIES = libcc1.la | ||
| 51 | BUILT_SOURCES = compiler-name.h | ||
| 52 | -- | ||
| 53 | 2.8.2 | ||
| 54 | |||
