summaryrefslogtreecommitdiff
path: root/package/hdparm/patches
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/hdparm/patches
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/hdparm/patches')
-rw-r--r--package/hdparm/patches/patch-Makefile30
1 files changed, 17 insertions, 13 deletions
diff --git a/package/hdparm/patches/patch-Makefile b/package/hdparm/patches/patch-Makefile
index 03c74f509..616b9fccc 100644
--- a/package/hdparm/patches/patch-Makefile
+++ b/package/hdparm/patches/patch-Makefile
@@ -1,32 +1,36 @@
--- hdparm-9.15.orig/Makefile 2008-12-10 01:14:28.000000000 +0100
-+++ hdparm-9.15/Makefile 2010-02-13 12:24:25.000000000 +0100
-@@ -13,7 +13,7 @@ oldmandir = $(manprefix)/man
++++ hdparm-9.15/Makefile 2011-01-15 20:46:42.000000000 +0100
+@@ -13,10 +13,10 @@ oldmandir = $(manprefix)/man
CC ?= gcc
STRIP ?= strip
-
+
-CFLAGS := -O2 -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith -Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fkeep-inline-functions -Wwrite-strings -Waggregate-return -Wnested-externs -Wtrigraphs $(CFLAGS)
+CFLAGS ?= -O2 -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith -Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fkeep-inline-functions -Wwrite-strings -Waggregate-return -Wnested-externs -Wtrigraphs $(CFLAGS)
-
+
#LDFLAGS = -s -static
- LDFLAGS = -s
+-LDFLAGS = -s
++LDFLAGS ?= -s
+ INSTALL = install
+ INSTALL_DATA = $(INSTALL) -m 644
+ INSTALL_DIR = $(INSTALL) -m 755 -d
@@ -28,7 +28,6 @@ all: hdparm
-
+
hdparm: hdparm.h sgio.h $(OBJS)
$(CC) $(LDFLAGS) -o hdparm $(OBJS)
- $(STRIP) hdparm
-
+
hdparm.o: hdparm.h sgio.h
-
+
@@ -46,9 +45,9 @@ install: all hdparm.8
- if [ -f $(DESTDIR)$(sbindir)/hdparm ]; then rm -f $(DESTDIR)$(sbindir)/hdparm ; fi
- if [ -f $(DESTDIR)$(mandir)/man8/hdparm.8 ]; then rm -f $(DESTDIR)$(mandir)/man8/hdparm.8 ;\
- elif [ -f $(DESTDIR)$(oldmandir)/man8/hdparm.8 ]; then rm -f $(DESTDIR)$(oldmandir)/man8/hdparm.8 ; fi
+ if [ -f $(DESTDIR)$(sbindir)/hdparm ]; then rm -f $(DESTDIR)$(sbindir)/hdparm ; fi
+ if [ -f $(DESTDIR)$(mandir)/man8/hdparm.8 ]; then rm -f $(DESTDIR)$(mandir)/man8/hdparm.8 ;\
+ elif [ -f $(DESTDIR)$(oldmandir)/man8/hdparm.8 ]; then rm -f $(DESTDIR)$(oldmandir)/man8/hdparm.8 ; fi
- $(INSTALL_PROGRAM) -D hdparm $(DESTDIR)$(sbindir)/hdparm
- if [ -d $(DESTDIR)$(mandir) ]; then $(INSTALL_DATA) -D hdparm.8 $(DESTDIR)$(mandir)/man8/hdparm.8 ;\
- elif [ -d $(DESTDIR)$(oldmandir) ]; then $(INSTALL_DATA) -D hdparm.8 $(DESTDIR)$(oldmandir)/man8/hdparm.8 ; fi
+ $(INSTALL_PROGRAM) hdparm $(DESTDIR)$(sbindir)/hdparm
+ if [ -d $(DESTDIR)$(mandir) ]; then $(INSTALL_DATA) hdparm.8 $(DESTDIR)$(mandir)/man8/hdparm.8 ;\
+ elif [ -d $(DESTDIR)$(oldmandir) ]; then $(INSTALL_DATA) hdparm.8 $(DESTDIR)$(oldmandir)/man8/hdparm.8 ; fi
-
+
clean:
- -rm -f hdparm $(OBJS) core 2>/dev/null
+ -rm -f hdparm $(OBJS) core 2>/dev/null