| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame^] | 1 | From acea0df9997a47f8b8224b6ca1618c8c9dfbe6d5 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] 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 7a274b3..db69bea 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 1916134..c8995d2 100644 |
| 39 | --- a/libcc1/Makefile.in |
| 40 | +++ b/libcc1/Makefile.in |
| 41 | @@ -262,8 +262,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 |