From 15c84adca94bfe4a89ece5c04f06a884cf508ebb Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 17 Jan 2011 21:55:49 +0100 Subject: 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 --- package/drbd/patches/patch-drbd_drbd_buildtag_c | 9 --------- package/drbd/patches/patch-user_Makefile_in | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 9 deletions(-) delete mode 100644 package/drbd/patches/patch-drbd_drbd_buildtag_c create mode 100644 package/drbd/patches/patch-user_Makefile_in (limited to 'package/drbd') 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 -- cgit v1.2.3