diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-17 21:55:49 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-17 21:55:49 +0100 |
| commit | 15c84adca94bfe4a89ece5c04f06a884cf508ebb (patch) | |
| tree | 727d3fd768a1abe75521190b90833b3a68cce4c6 /package/pptp | |
| parent | 0de5d9ecedff55481b3c1eb9c3841de17716a485 (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/pptp')
| -rw-r--r-- | package/pptp/Makefile | 3 | ||||
| -rw-r--r-- | package/pptp/patches/patch-Makefile | 22 |
2 files changed, 22 insertions, 3 deletions
diff --git a/package/pptp/Makefile b/package/pptp/Makefile index c68d50958..d789c8003 100644 --- a/package/pptp/Makefile +++ b/package/pptp/Makefile @@ -19,9 +19,6 @@ $(eval $(call PKG_template,PPTP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_ CONFIG_STYLE:= manual INSTALL_STYLE:= manual -MAKE_FLAGS+= CC="${TARGET_CC}" \ - CFLAGS="${TARGET_CFLAGS}" - do-install: ${INSTALL_DIR} ${IDIR_PPTP}/sbin ${INSTALL_DIR} ${IDIR_PPTP}/usr/sbin diff --git a/package/pptp/patches/patch-Makefile b/package/pptp/patches/patch-Makefile new file mode 100644 index 000000000..1b7ad4a3d --- /dev/null +++ b/package/pptp/patches/patch-Makefile @@ -0,0 +1,22 @@ +--- pptp-1.6.0.orig/Makefile 2005-02-18 02:42:45.000000000 +0100 ++++ pptp-1.6.0/Makefile 2011-01-16 21:44:38.000000000 +0100 +@@ -11,14 +11,15 @@ BINDIR=$(DESTDIR)/usr/sbin + MANDIR=$(DESTDIR)/usr/share/man/man8 + PPPDIR=$(DESTDIR)/etc/ppp + +-CC = gcc ++CC ?= gcc + RM = rm -f + OPTIMIZE= -O0 + DEBUG = -g + INCLUDE = +-CFLAGS = -Wall $(OPTIMIZE) $(DEBUG) $(INCLUDE) +-LIBS = -lutil +-LDFLAGS = ++CPPFLAGS ?= ++CFLAGS ?= -Wall $(OPTIMIZE) $(DEBUG) $(INCLUDE) ++LIBS ?= -lutil ++LDFLAGS ?= + + PPTP_BIN = pptp + |