0015-libcc1-fix-libcc1-s-install-path-and-rpath.patch 2.1 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051
  1. From bf918db7117f41d3c04162095641165ca241707d 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. * Install libcc1.so and libcc1plugin.so into
  6. $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version), as what we
  7. had done to lto-plugin.
  8. * Fix bad RPATH iussue:
  9. gcc-5.2.0: package gcc-plugins contains bad RPATH /patht/to/tmp/sysroots/qemux86-64/usr/lib64/../lib64 in file
  10. /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
  11. [rpaths]
  12. Upstream-Status: Inappropriate [OE configuration]
  13. Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
  14. ---
  15. libcc1/Makefile.am | 4 ++--
  16. libcc1/Makefile.in | 4 ++--
  17. 2 files changed, 4 insertions(+), 4 deletions(-)
  18. diff --git a/libcc1/Makefile.am b/libcc1/Makefile.am
  19. index 6e3a34ff7e2..3f3f6391aba 100644
  20. --- a/libcc1/Makefile.am
  21. +++ b/libcc1/Makefile.am
  22. @@ -40,8 +40,8 @@ libiberty = $(if $(wildcard $(libiberty_noasan)),$(Wc)$(libiberty_noasan), \
  23. $(Wc)$(libiberty_normal)))
  24. libiberty_dep = $(patsubst $(Wc)%,%,$(libiberty))
  25. -plugindir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/plugin
  26. -cc1libdir = $(libdir)/$(libsuffix)
  27. +cc1libdir = $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version)
  28. +plugindir = $(cc1libdir)
  29. if ENABLE_PLUGIN
  30. plugin_LTLIBRARIES = libcc1plugin.la libcp1plugin.la
  31. diff --git a/libcc1/Makefile.in b/libcc1/Makefile.in
  32. index f8f590d71e9..56462492045 100644
  33. --- a/libcc1/Makefile.in
  34. +++ b/libcc1/Makefile.in
  35. @@ -396,8 +396,8 @@ libiberty = $(if $(wildcard $(libiberty_noasan)),$(Wc)$(libiberty_noasan), \
  36. $(Wc)$(libiberty_normal)))
  37. libiberty_dep = $(patsubst $(Wc)%,%,$(libiberty))
  38. -plugindir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/plugin
  39. -cc1libdir = $(libdir)/$(libsuffix)
  40. +cc1libdir = $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version)
  41. +plugindir = $(cc1libdir)
  42. @ENABLE_PLUGIN_TRUE@plugin_LTLIBRARIES = libcc1plugin.la libcp1plugin.la
  43. @ENABLE_PLUGIN_TRUE@cc1lib_LTLIBRARIES = libcc1.la
  44. shared_source = callbacks.cc callbacks.hh connection.cc connection.hh \