diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-15 22:30:13 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-15 22:30:13 +0100 |
| commit | c57d0300bd42fabd8eeda2a95b6c3960d6e7ce07 (patch) | |
| tree | b53bc538246b5a900300b5c6b5ea740f978196f4 /package/hdparm/patches | |
| parent | cf4b3959527339206254b8c8fc44deb391beeb10 (diff) | |
| parent | 023560ac69a2ecf5659c668c26c0af6b5612a46b (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/nspr/Makefile
Diffstat (limited to 'package/hdparm/patches')
| -rw-r--r-- | package/hdparm/patches/patch-Makefile | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/package/hdparm/patches/patch-Makefile b/package/hdparm/patches/patch-Makefile new file mode 100644 index 000000000..03c74f509 --- /dev/null +++ b/package/hdparm/patches/patch-Makefile @@ -0,0 +1,32 @@ +--- 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 + 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 +@@ -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 +- $(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 |