diff options
Diffstat (limited to 'package/openipmi/0001-Avoid-searching-host-library-path.patch')
| -rw-r--r-- | package/openipmi/0001-Avoid-searching-host-library-path.patch | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/package/openipmi/0001-Avoid-searching-host-library-path.patch b/package/openipmi/0001-Avoid-searching-host-library-path.patch index 9a51d97e27..44a57dcfb4 100644 --- a/package/openipmi/0001-Avoid-searching-host-library-path.patch +++ b/package/openipmi/0001-Avoid-searching-host-library-path.patch @@ -1,4 +1,4 @@ -From ca6e99d9fa4bf503a883407e964eaad5e18d51c7 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Baruch Siach <baruch@tkos.co.il> Date: Wed, 22 Jul 2015 07:04:33 +0300 Subject: [PATCH] Avoid searching host library path @@ -9,44 +9,44 @@ host libraries which may be different than target libraries. Don't use $(libdir) in the library search path. Signed-off-by: Baruch Siach <baruch@tkos.co.il> +Signed-off-by: Joel Stanley <joel@jms.id.au> --- - cmdlang/Makefile.am | 2 +- - unix/Makefile.am | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) + cmdlang/Makefile.am | 3 +-- + unix/Makefile.am | 6 ++---- + 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am -index e80090dd0c6f..b59ff244b9a8 100644 +index 264ee12be79f..0b3843784656 100644 --- a/cmdlang/Makefile.am +++ b/cmdlang/Makefile.am -@@ -16,7 +16,7 @@ libOpenIPMIcmdlang_la_LIBADD = -lm \ +@@ -15,8 +15,7 @@ libOpenIPMIcmdlang_la_SOURCES = cmdlang.c cmd_domain.c cmd_entity.c cmd_mc.c \ + libOpenIPMIcmdlang_la_LIBADD = -lm \ $(top_builddir)/utils/libOpenIPMIutils.la \ $(top_builddir)/lib/libOpenIPMI.la - libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -Wl,-Map -Wl,libOpenIPMIcmdlang.map -L$(libdir) -+ -Wl,-Map -Wl,libOpenIPMIcmdlang.map +-libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ +- -L$(libdir) ++libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) bin_PROGRAMS = openipmish diff --git a/unix/Makefile.am b/unix/Makefile.am -index a7921477e1c4..a108bc679c9a 100644 +index 5128839dad13..bd0f897ba8d6 100644 --- a/unix/Makefile.am +++ b/unix/Makefile.am -@@ -11,13 +11,13 @@ libOpenIPMIpthread_la_SOURCES = posix_thread_os_hnd.c selector.c +@@ -10,14 +10,12 @@ lib_LTLIBRARIES = libOpenIPMIposix.la libOpenIPMIpthread.la + libOpenIPMIpthread_la_SOURCES = posix_thread_os_hnd.c selector.c libOpenIPMIpthread_la_LIBADD = -lpthread $(GDBM_LIB) \ - $(top_builddir)/utils/libOpenIPMIutils.la - libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -Wl,-Map -Wl,libOpenIPMIpthread.map -L$(libdir) -+ -Wl,-Map -Wl,libOpenIPMIpthread.map + $(top_builddir)/utils/libOpenIPMIutils.la $(RT_LIB) +-libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ +- -L$(libdir) ++libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) libOpenIPMIposix_la_SOURCES = posix_os_hnd.c selector.c libOpenIPMIposix_la_LIBADD = $(top_builddir)/utils/libOpenIPMIutils.la \ - $(GDBM_LIB) - libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -Wl,-Map -Wl,libOpenIPMIposix.map -L$(libdir) -+ -Wl,-Map -Wl,libOpenIPMIposix.map + $(GDBM_LIB) $(RT_LIB) +-libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ +- -L$(libdir) ++libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) noinst_HEADERS = heap.h --- -2.1.4 - |
