0001-Avoid-searching-host-library-path.patch 2.0 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
  2. From: Baruch Siach <baruch@tkos.co.il>
  3. Date: Wed, 22 Jul 2015 07:04:33 +0300
  4. Subject: [PATCH] Avoid searching host library path
  5. The $(libdir) variable points to the location of the directory on the target
  6. system, /usr/lib by default. When cross compiling this directory contains the
  7. host libraries which may be different than target libraries. Don't use
  8. $(libdir) in the library search path.
  9. Signed-off-by: Baruch Siach <baruch@tkos.co.il>
  10. Signed-off-by: Joel Stanley <joel@jms.id.au>
  11. [Fabrice: refresh patch for 2.0.32]
  12. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  13. [Upstream status: https://sourceforge.net/p/openipmi/patches/35]
  14. ---
  15. cmdlang/Makefile.am | 3 +--
  16. unix/Makefile.am | 6 ++----
  17. 2 files changed, 3 insertions(+), 6 deletions(-)
  18. diff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am
  19. index 264ee12be79f..0b3843784656 100644
  20. --- a/cmdlang/Makefile.am
  21. +++ b/cmdlang/Makefile.am
  22. @@ -15,7 +15,7 @@ libOpenIPMIcmdlang_la_SOURCES = cmdlang.c cmd_domain.c cmd_entity.c cmd_mc.c \
  23. $(top_builddir)/utils/libOpenIPMIutils.la \
  24. $(top_builddir)/lib/libOpenIPMI.la
  25. libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
  26. - -L$(libdir) -no-undefined
  27. + -no-undefined
  28. bin_PROGRAMS = openipmish
  29. diff --git a/unix/Makefile.am b/unix/Makefile.am
  30. index 5128839dad13..bd0f897ba8d6 100644
  31. --- a/unix/Makefile.am
  32. +++ b/unix/Makefile.am
  33. @@ -10,12 +10,12 @@ lib_LTLIBRARIES = libOpenIPMIposix.la libOpenIPMIpthread.la
  34. libOpenIPMIpthread_la_LIBADD = -lpthread $(GDBM_LIB) \
  35. $(top_builddir)/utils/libOpenIPMIutils.la $(RT_LIB)
  36. libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
  37. - -L$(libdir) -no-undefined
  38. + -no-undefined
  39. libOpenIPMIposix_la_SOURCES = posix_os_hnd.c selector.c
  40. libOpenIPMIposix_la_LIBADD = $(top_builddir)/utils/libOpenIPMIutils.la \
  41. $(GDBM_LIB) $(RT_LIB)
  42. libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
  43. - -L$(libdir) -no-undefined
  44. + -no-undefined
  45. noinst_HEADERS = heap.h