forked from pool/ocfs2-tools
f52787975b
patch for bug838705 OBS-URL: https://build.opensuse.org/request/show/198636 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/ocfs2-tools?expand=0&rev=68
79 lines
4.0 KiB
Diff
79 lines
4.0 KiB
Diff
Index: ocfs2-tools-1.8.2+git.1361836695.ff84eb5/fsck.ocfs2/Makefile
|
|
===================================================================
|
|
--- ocfs2-tools-1.8.2+git.1361836695.ff84eb5.orig/fsck.ocfs2/Makefile
|
|
+++ ocfs2-tools-1.8.2+git.1361836695.ff84eb5/fsck.ocfs2/Makefile
|
|
@@ -12,7 +12,7 @@ LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -lo
|
|
LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a
|
|
LIBO2DLM_LIBS = -L$(TOPDIR)/libo2dlm -lo2dlm $(DL_LIBS)
|
|
LIBO2DLM_DEPS = $(TOPDIR)/libo2dlm/libo2dlm.a
|
|
-LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb -lcmap -ldlm
|
|
+LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb -lcmap -ldlm_lt
|
|
LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
|
|
LIBTOOLS_INTERNAL_LIBS = -L$(TOPDIR)/libtools-internal -ltools-internal
|
|
LIBTOOLS_INTERNAL_DEPS = $(TOPDIR)/libtools-internal/libtools-internal.a
|
|
Index: ocfs2-tools-1.8.2+git.1361836695.ff84eb5/mkfs.ocfs2/Makefile
|
|
===================================================================
|
|
--- ocfs2-tools-1.8.2+git.1361836695.ff84eb5.orig/mkfs.ocfs2/Makefile
|
|
+++ ocfs2-tools-1.8.2+git.1361836695.ff84eb5/mkfs.ocfs2/Makefile
|
|
@@ -8,7 +8,7 @@ SBIN_PROGRAMS = mkfs.ocfs2
|
|
LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
|
|
LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a
|
|
|
|
-LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb -lcmap -ldlm
|
|
+LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb -lcmap -ldlm_lt
|
|
LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
|
|
|
|
LIBO2DLM_LIBS = -L$(TOPDIR)/libo2dlm -lo2dlm $(DL_LIBS)
|
|
Index: ocfs2-tools-1.8.2+git.1361836695.ff84eb5/mount.ocfs2/Makefile
|
|
===================================================================
|
|
--- ocfs2-tools-1.8.2+git.1361836695.ff84eb5.orig/mount.ocfs2/Makefile
|
|
+++ ocfs2-tools-1.8.2+git.1361836695.ff84eb5/mount.ocfs2/Makefile
|
|
@@ -10,7 +10,7 @@ LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -lo
|
|
LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a
|
|
LIBO2DLM_LIBS = -L$(TOPDIR)/libo2dlm -lo2dlm $(DL_LIBS)
|
|
LIBO2DLM_DEPS = $(TOPDIR)/libo2dlm/libo2dlm.a
|
|
-LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb -ldlm -lcmap
|
|
+LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb -ldlm_lt -lcmap
|
|
LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
|
|
|
|
DEFINES = -DVERSION=\"$(VERSION)\"
|
|
Index: ocfs2-tools-1.8.2+git.1361836695.ff84eb5/mounted.ocfs2/Makefile
|
|
===================================================================
|
|
--- ocfs2-tools-1.8.2+git.1361836695.ff84eb5.orig/mounted.ocfs2/Makefile
|
|
+++ ocfs2-tools-1.8.2+git.1361836695.ff84eb5/mounted.ocfs2/Makefile
|
|
@@ -8,7 +8,7 @@ LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/liboc
|
|
LIBO2DLM_LIBS = -L$(TOPDIR)/libo2dlm -lo2dlm $(DL_LIBS)
|
|
LIBO2DLM_DEPS = $(TOPDIR)/libo2dlm/libo2dlm.a
|
|
|
|
-LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb -ldlm -lcmap
|
|
+LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb -ldlm_lt -lcmap
|
|
LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
|
|
|
|
LIBTOOLS_INTERNAL_LIBS = -L$(TOPDIR)/libtools-internal -ltools-internal
|
|
Index: ocfs2-tools-1.8.2+git.1361836695.ff84eb5/ocfs2_hb_ctl/Makefile
|
|
===================================================================
|
|
--- ocfs2-tools-1.8.2+git.1361836695.ff84eb5.orig/ocfs2_hb_ctl/Makefile
|
|
+++ ocfs2-tools-1.8.2+git.1361836695.ff84eb5/ocfs2_hb_ctl/Makefile
|
|
@@ -10,7 +10,7 @@ LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -lo
|
|
LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a
|
|
LIBO2DLM_LIBS = -L$(TOPDIR)/libo2dlm -lo2dlm $(DL_LIBS)
|
|
LIBO2DLM_DEPS = $(TOPDIR)/libo2dlm/libo2dlm.a
|
|
-LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb -ldlm -lcmap
|
|
+LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb -ldlm_lt -lcmap
|
|
LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
|
|
|
|
ifndef OCFS2_DYNAMIC_CTL
|
|
Index: ocfs2-tools-1.8.2+git.1361836695.ff84eb5/tunefs.ocfs2/Makefile
|
|
===================================================================
|
|
--- ocfs2-tools-1.8.2+git.1361836695.ff84eb5.orig/tunefs.ocfs2/Makefile
|
|
+++ ocfs2-tools-1.8.2+git.1361836695.ff84eb5/tunefs.ocfs2/Makefile
|
|
@@ -11,7 +11,7 @@ LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/liboc
|
|
LIBO2DLM_LIBS = -L$(TOPDIR)/libo2dlm -lo2dlm $(DL_LIBS)
|
|
LIBO2DLM_DEPS = $(TOPDIR)/libo2dlm/libo2dlm.a
|
|
|
|
-LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb -ldlm -lcmap
|
|
+LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb -ldlm_lt -lcmap
|
|
LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
|
|
|
|
UNINST_LIBRARIES = libocfs2ne.a
|