summaryrefslogtreecommitdiff
path: root/package/libowfat
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/libowfat
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/libowfat')
-rw-r--r--package/libowfat/Makefile3
-rw-r--r--package/libowfat/patches/patch-GNUmakefile22
-rw-r--r--package/libowfat/patches/patch-Makefile11
3 files changed, 33 insertions, 3 deletions
diff --git a/package/libowfat/Makefile b/package/libowfat/Makefile
index c6e21ae01..d1b6150b5 100644
--- a/package/libowfat/Makefile
+++ b/package/libowfat/Makefile
@@ -19,7 +19,8 @@ CONFIG_STYLE:= manual
TCFLAGS+= ${TCPPFLAGS}
MAKE_FILE= GNUmakefile
-MAKE_FLAGS+= DIET= CC='${TARGET_CC}' CROSS=${TARGET_CROSS}
+MAKE_FLAGS+= DIET= CC='${TARGET_CC}' CROSS=${TARGET_CROSS} \
+ LDFLAGS='${TARGET_LDFLAGS}'
FAKE_FLAGS+= prefix='${WRKINST}/usr' \
INCLUDEDIR='${WRKINST}/usr/include/owfat'
diff --git a/package/libowfat/patches/patch-GNUmakefile b/package/libowfat/patches/patch-GNUmakefile
index 24c836bac..553338e2f 100644
--- a/package/libowfat/patches/patch-GNUmakefile
+++ b/package/libowfat/patches/patch-GNUmakefile
@@ -1,6 +1,6 @@
$Id$
---- libowfat-0.25.orig/GNUmakefile 2006-07-16 01:17:01.000000000 +0200
-+++ libowfat-0.25/GNUmakefile 2007-07-06 17:35:01.000000000 +0200
+--- libowfat-0.28.orig/GNUmakefile 2006-07-16 01:17:01.000000000 +0200
++++ libowfat-0.28/GNUmakefile 2011-01-15 13:58:17.000000000 +0100
@@ -18,7 +18,7 @@ all: t $(LIBS) libowfat.a libsocket
CROSS=
#CROSS=i686-mingw-
@@ -10,3 +10,21 @@ $Id$
#CFLAGS=-pipe -Os -march=pentiumpro -mcpu=pentiumpro -fomit-frame-pointer -fschedule-insns2 -Wall
# CFLAGS += -fstrict-aliasing -Wstrict-aliasing=2
+@@ -27,7 +27,7 @@ CFLAGS += -D_REENTRANT
+
+ # startrip
+ ifneq ($(DEBUG),)
+-CFLAGS=-pipe -Wall -g
++CFLAGS=-g -Wall
+ endif
+ path = $(subst :, ,$(PATH))
+ diet_path = $(foreach dir,$(path),$(wildcard $(dir)/diet))
+@@ -147,7 +147,7 @@ CFLAGS+=-I.
+ t.o: iopause.h
+
+ t: t.o libowfat.a libsocket
+- $(DIET) $(CC) -g -o $@ t.o libowfat.a `cat libsocket`
++ $(DIET) $(CC) $(LDFLAGS) -o $@ t.o libowfat.a `cat libsocket`
+
+ .PHONY: all clean tar install rename
+ clean:
diff --git a/package/libowfat/patches/patch-Makefile b/package/libowfat/patches/patch-Makefile
new file mode 100644
index 000000000..226d77837
--- /dev/null
+++ b/package/libowfat/patches/patch-Makefile
@@ -0,0 +1,11 @@
+--- libowfat-0.28.orig/Makefile 2008-11-15 17:06:28.000000000 +0100
++++ libowfat-0.28/Makefile 2011-01-15 13:40:31.000000000 +0100
+@@ -603,7 +603,7 @@ CFLAGS+=-I.
+ t.o: iopause.h
+
+ t: t.o libowfat.a libsocket
+- $(DIET) $(CC) -g -o $@ t.o libowfat.a `cat libsocket`
++ $(DIET) $(CC) $(LDFLAGS) -g -o $@ t.o libowfat.a `cat libsocket`
+
+ .PHONY: all clean tar install rename
+ clean: