1*4882a593SmuzhiyunFrom 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Baruch Siach <baruch@tkos.co.il> 3*4882a593SmuzhiyunDate: Wed, 22 Jul 2015 07:04:33 +0300 4*4882a593SmuzhiyunSubject: [PATCH] Avoid searching host library path 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunThe $(libdir) variable points to the location of the directory on the target 7*4882a593Smuzhiyunsystem, /usr/lib by default. When cross compiling this directory contains the 8*4882a593Smuzhiyunhost libraries which may be different than target libraries. Don't use 9*4882a593Smuzhiyun$(libdir) in the library search path. 10*4882a593Smuzhiyun 11*4882a593SmuzhiyunSigned-off-by: Baruch Siach <baruch@tkos.co.il> 12*4882a593SmuzhiyunSigned-off-by: Joel Stanley <joel@jms.id.au> 13*4882a593Smuzhiyun--- 14*4882a593Smuzhiyun cmdlang/Makefile.am | 3 +-- 15*4882a593Smuzhiyun unix/Makefile.am | 6 ++---- 16*4882a593Smuzhiyun 2 files changed, 3 insertions(+), 6 deletions(-) 17*4882a593Smuzhiyun 18*4882a593Smuzhiyundiff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am 19*4882a593Smuzhiyunindex 264ee12be79f..0b3843784656 100644 20*4882a593Smuzhiyun--- a/cmdlang/Makefile.am 21*4882a593Smuzhiyun+++ b/cmdlang/Makefile.am 22*4882a593Smuzhiyun@@ -15,8 +15,7 @@ libOpenIPMIcmdlang_la_SOURCES = cmdlang.c cmd_domain.c cmd_entity.c cmd_mc.c \ 23*4882a593Smuzhiyun libOpenIPMIcmdlang_la_LIBADD = -lm \ 24*4882a593Smuzhiyun $(top_builddir)/utils/libOpenIPMIutils.la \ 25*4882a593Smuzhiyun $(top_builddir)/lib/libOpenIPMI.la 26*4882a593Smuzhiyun-libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ 27*4882a593Smuzhiyun- -L$(libdir) 28*4882a593Smuzhiyun+libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) 29*4882a593Smuzhiyun 30*4882a593Smuzhiyun bin_PROGRAMS = openipmish 31*4882a593Smuzhiyun 32*4882a593Smuzhiyundiff --git a/unix/Makefile.am b/unix/Makefile.am 33*4882a593Smuzhiyunindex 5128839dad13..bd0f897ba8d6 100644 34*4882a593Smuzhiyun--- a/unix/Makefile.am 35*4882a593Smuzhiyun+++ b/unix/Makefile.am 36*4882a593Smuzhiyun@@ -10,14 +10,12 @@ lib_LTLIBRARIES = libOpenIPMIposix.la libOpenIPMIpthread.la 37*4882a593Smuzhiyun libOpenIPMIpthread_la_SOURCES = posix_thread_os_hnd.c selector.c 38*4882a593Smuzhiyun libOpenIPMIpthread_la_LIBADD = -lpthread $(GDBM_LIB) \ 39*4882a593Smuzhiyun $(top_builddir)/utils/libOpenIPMIutils.la $(RT_LIB) 40*4882a593Smuzhiyun-libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ 41*4882a593Smuzhiyun- -L$(libdir) 42*4882a593Smuzhiyun+libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) 43*4882a593Smuzhiyun 44*4882a593Smuzhiyun libOpenIPMIposix_la_SOURCES = posix_os_hnd.c selector.c 45*4882a593Smuzhiyun libOpenIPMIposix_la_LIBADD = $(top_builddir)/utils/libOpenIPMIutils.la \ 46*4882a593Smuzhiyun $(GDBM_LIB) $(RT_LIB) 47*4882a593Smuzhiyun-libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ 48*4882a593Smuzhiyun- -L$(libdir) 49*4882a593Smuzhiyun+libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) 50*4882a593Smuzhiyun 51*4882a593Smuzhiyun noinst_HEADERS = heap.h 52*4882a593Smuzhiyun 53