Patchwork [XFSTESTS,3/3] dmapi: fix build failure if libdm is provided via -ldm

login
register
mail settings
Submitter Theodore Ts'o
Date July 21, 2011, 11:52 p.m.
Message ID <1311292324-4348-3-git-send-email-tytso@mit.edu>
Download mbox | patch
Permalink /patch/106191/
State Not Applicable
Headers show

Comments

Theodore Ts'o - July 21, 2011, 11:52 p.m.
The value of $(LIBDM) may be a linker specification -ldm, and not a
file.  So it's not OK to add this to the dependency, since make will
then complain that it doesn't know how to make the target -ldm.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---
 dmapi/src/common/cmd/Makefile                  |    2 +-
 dmapi/src/sample_hsm/Makefile                  |    2 +-
 dmapi/src/suite1/cmd/Makefile                  |    2 +-
 dmapi/src/suite1/cmd/probe_punch_xfsctl_hole.c |    2 +-
 dmapi/src/suite2/src/Makefile                  |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
Christoph Hellwig - July 22, 2011, 2:29 p.m.
Thanks, applied.
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/dmapi/src/common/cmd/Makefile b/dmapi/src/common/cmd/Makefile
index 4b0e550..4525581 100644
--- a/dmapi/src/common/cmd/Makefile
+++ b/dmapi/src/common/cmd/Makefile
@@ -38,7 +38,7 @@  include $(BUILDRULES)
 
 install install-dev: default
 
-$(TARGETS): $(LLDLIBS)
+$(TARGETS):
 	@echo "    [CC]    $@"
 	$(Q)$(LTLINK) $@.c -o $@ $(CFLAGS) $(LDFLAGS) $(LDLIBS)
 
diff --git a/dmapi/src/sample_hsm/Makefile b/dmapi/src/sample_hsm/Makefile
index 7a4ca8c..55df563 100644
--- a/dmapi/src/sample_hsm/Makefile
+++ b/dmapi/src/sample_hsm/Makefile
@@ -38,7 +38,7 @@  include $(BUILDRULES)
 
 install install-dev: default
 
-$(TARGETS): $(LLDLIBS)
+$(TARGETS):
 	@echo "    [CC]    $@"
 	$(Q)$(LTLINK) $@.c -o $@ $(CFLAGS) $(LDFLAGS) $(LDLIBS)
 
diff --git a/dmapi/src/suite1/cmd/Makefile b/dmapi/src/suite1/cmd/Makefile
index 7e51763..05dbead 100644
--- a/dmapi/src/suite1/cmd/Makefile
+++ b/dmapi/src/suite1/cmd/Makefile
@@ -61,7 +61,7 @@  include $(BUILDRULES)
 
 install install-dev: default
 
-$(TARGETS): $(LLDLIBS)
+$(TARGETS):
 	@echo "    [CC]    $@"
 	$(Q)$(LTLINK) $@.c -o $@ $(CFLAGS) $(LDFLAGS) $(LDLIBS)
 
diff --git a/dmapi/src/suite1/cmd/probe_punch_xfsctl_hole.c b/dmapi/src/suite1/cmd/probe_punch_xfsctl_hole.c
index 6b4d0b6..c01dff0 100644
--- a/dmapi/src/suite1/cmd/probe_punch_xfsctl_hole.c
+++ b/dmapi/src/suite1/cmd/probe_punch_xfsctl_hole.c
@@ -69,7 +69,7 @@  xfsctl_punch_hole(
 	xfs_flock64_t   flock;
 	int		fd;
 	
-	if ((fd = open(path, O_RDWR|O_CREAT)) < 0) {
+	if ((fd = open(path, O_RDWR|O_CREAT, 0600)) < 0) {
 		perror(path);
 		exit(errno);
 	}
diff --git a/dmapi/src/suite2/src/Makefile b/dmapi/src/suite2/src/Makefile
index 91a0f00..c5cf6da 100644
--- a/dmapi/src/suite2/src/Makefile
+++ b/dmapi/src/suite2/src/Makefile
@@ -44,7 +44,7 @@  include $(BUILDRULES)
 
 install install-dev: default
 
-$(TARGETS): $(LLDLIBS)
+$(TARGETS):
 	@echo "    [CC]    $@"
 	$(Q)$(LTLINK) $@.c -o $@ $(CFLAGS) $(LDFLAGS) $(LDLIBS)