summaryrefslogtreecommitdiff
path: root/package/drbd
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-01-17 21:55:49 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2011-01-17 21:55:49 +0100
commit15c84adca94bfe4a89ece5c04f06a884cf508ebb (patch)
tree727d3fd768a1abe75521190b90833b3a68cce4c6 /package/drbd
parent0de5d9ecedff55481b3c1eb9c3841de17716a485 (diff)
fix packages to be compile with stack protector
- libtool do not pass -fstack-protector while linking, but this is required to successfully link libraries or executables with SSP - pass LDFLAGS for non-libtool packages
Diffstat (limited to 'package/drbd')
-rw-r--r--package/drbd/patches/patch-drbd_drbd_buildtag_c9
-rw-r--r--package/drbd/patches/patch-user_Makefile_in24
2 files changed, 24 insertions, 9 deletions
diff --git a/package/drbd/patches/patch-drbd_drbd_buildtag_c b/package/drbd/patches/patch-drbd_drbd_buildtag_c
deleted file mode 100644
index 7a8358ea7..000000000
--- a/package/drbd/patches/patch-drbd_drbd_buildtag_c
+++ /dev/null
@@ -1,9 +0,0 @@
---- drbd-8.3.8.1.orig/drbd/drbd_buildtag.c 2010-07-09 10:19:05.000000000 +0200
-+++ drbd-8.3.8.1/drbd/drbd_buildtag.c 2010-11-26 18:59:58.000000000 +0100
-@@ -3,5 +3,5 @@
- const char *drbd_buildtag(void)
- {
- return "GIT-hash: 0d8589fcc32c874df57c930ca1691399b55ec893"
-- " build by lars@soda, 2010-07-09 10:19:24";
-+ " build by wbx@neon.lan, 2010-11-26 18:59:58";
- }
diff --git a/package/drbd/patches/patch-user_Makefile_in b/package/drbd/patches/patch-user_Makefile_in
new file mode 100644
index 000000000..2979decb1
--- /dev/null
+++ b/package/drbd/patches/patch-user_Makefile_in
@@ -0,0 +1,24 @@
+--- drbd-8.3.8.1.orig/user/Makefile.in 2010-05-10 16:09:13.000000000 +0200
++++ drbd-8.3.8.1/user/Makefile.in 2011-01-14 22:16:28.000000000 +0100
+@@ -74,7 +74,7 @@ drbd_strings.c: ../drbd/drbd_strings.c
+ cp $^ $@
+
+ drbdadm: $(drbdadm-obj)
+- $(CC) -o $@ $^
++ $(CC) $(LDFLAGS) -o $@ $^
+
+ drbdadm_scanner.c: drbdadm_scanner.fl drbdadm_parser.h
+ flex -s -odrbdadm_scanner.c drbdadm_scanner.fl
+@@ -83,10 +83,10 @@ drbdmeta_scanner.c: drbdmeta_scanner.fl
+ flex -s -odrbdmeta_scanner.c drbdmeta_scanner.fl
+
+ drbdsetup: $(drbdsetup-obj)
+- $(CC) -o $@ $^
++ $(CC) $(LDFLAGS) -o $@ $^
+
+ drbdmeta: $(drbdmeta-obj)
+- $(CC) -o $@ $^
++ $(CC) $(LDFLAGS) -o $@ $^
+
+ clean:
+ rm -f drbdadm_scanner.c drbdmeta_scanner.c