diff options
Diffstat (limited to 'meta-oe/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch')
-rw-r--r-- | meta-oe/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch | 81 |
1 files changed, 23 insertions, 58 deletions
diff --git a/meta-oe/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch b/meta-oe/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch index 6f16234bc7..83485a9e60 100644 --- a/meta-oe/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch +++ b/meta-oe/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch @@ -13,73 +13,38 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> unix/Makefile.am | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) -diff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am -index 00c3d2b..0fa85d7 100644 ---- a/cmdlang/Makefile.am -+++ b/cmdlang/Makefile.am -@@ -16,7 +16,7 @@ libOpenIPMIcmdlang_la_LIBADD = -lm \ +Index: OpenIPMI-2.0.24/cmdlang/Makefile.am +=================================================================== +--- OpenIPMI-2.0.24.orig/cmdlang/Makefile.am ++++ OpenIPMI-2.0.24/cmdlang/Makefile.am +@@ -15,8 +15,7 @@ libOpenIPMIcmdlang_la_SOURCES = cmdlang. + 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/glib/Makefile.am b/glib/Makefile.am -index 671cae2..eff55f3 100644 ---- a/glib/Makefile.am -+++ b/glib/Makefile.am -@@ -11,14 +11,14 @@ libOpenIPMIglib_la_SOURCES = glib_os_hnd.c - libOpenIPMIglib_la_CFLAGS = $(GLIB_CFLAGS) $(AM_CFLAGS) - libOpenIPMIglib_la_LIBADD = $(GDBM_LIB) - libOpenIPMIglib_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -Wl,-Map -Wl,libOpenIPMIglib.map $(GLIB_LIBS) -L$(libdir) \ -+ -Wl,-Map -Wl,libOpenIPMIglib.map $(GLIB_LIBS) \ - -rpath $(libdir) - - libOpenIPMIglib12_la_SOURCES = glib_os_hnd.c - libOpenIPMIglib12_la_CFLAGS = $(GLIB12_CFLAGS) $(AM_CFLAGS) - libOpenIPMIglib12_la_LIBADD = $(GDBM_LIB) - libOpenIPMIglib12_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -Wl,-Map -Wl,libOpenIPMIglib12.map $(GLIB12_LIBS) -L$(libdir) \ -+ -Wl,-Map -Wl,libOpenIPMIglib12.map $(GLIB12_LIBS) \ - -rpath $(libdir) - - CLEANFILES = libOpenIPMIglib.map libOpenIPMIglib12.map -diff --git a/tcl/Makefile.am b/tcl/Makefile.am -index b702819..282619c 100644 ---- a/tcl/Makefile.am -+++ b/tcl/Makefile.am -@@ -11,7 +11,7 @@ libOpenIPMItcl_la_SOURCES = tcl_os_hnd.c - libOpenIPMItcl_la_CFLAGS = $(TCL_CFLAGS) $(AM_CFLAGS) - libOpenIPMItcl_la_LIBADD = $(GDBM_LIB) - libOpenIPMItcl_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -Wl,-Map -Wl,libOpenIPMItcl.map $(TCL_LIBS) -L$(libdir) \ -+ -Wl,-Map -Wl,libOpenIPMItcl.map $(TCL_LIBS) \ - -rpath $(libdir) - - noinst_PROGRAMS = test_handlers -diff --git a/unix/Makefile.am b/unix/Makefile.am -index a792147..a108bc6 100644 ---- a/unix/Makefile.am -+++ b/unix/Makefile.am -@@ -11,13 +11,13 @@ libOpenIPMIpthread_la_SOURCES = posix_thread_os_hnd.c selector.c +Index: OpenIPMI-2.0.24/unix/Makefile.am +=================================================================== +--- OpenIPMI-2.0.24.orig/unix/Makefile.am ++++ OpenIPMI-2.0.24/unix/Makefile.am +@@ -10,14 +10,12 @@ lib_LTLIBRARIES = libOpenIPMIposix.la li + 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 --- -1.7.1 - |