From 15c84adca94bfe4a89ece5c04f06a884cf508ebb Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
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/pipacs/Makefile     | 4 +---
 package/pipacs/src/Makefile | 8 +++++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'package/pipacs')

diff --git a/package/pipacs/Makefile b/package/pipacs/Makefile
index 612771db5..81d4176e9 100644
--- a/package/pipacs/Makefile
+++ b/package/pipacs/Makefile
@@ -4,6 +4,7 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		pipacs
+PKG_VERSION:=		0.1
 PKG_RELEASE:=		2
 PKG_DESCR:=		an UNIX socket accounting/wiewer program
 PKG_SECTION:=		net/misc
@@ -17,9 +18,6 @@ $(eval $(call PKG_template,PIPACS,${PKG_NAME},${PKG_RELEASE},${PKG_DEPENDS},${PK
 CONFIG_STYLE:=          manual
 INSTALL_STYLE:=         manual
 
-MAKE_FLAGS+=		CFLAGS="${TCFLAGS} ${TCPPFLAGS}" \
-			${TARGET_CONFIGURE_OPTS}
-
 do-install:
 	${INSTALL_DIR} ${IDIR_PIPACS}/usr/bin
 	${INSTALL_BIN} ${WRKBUILD}/pipacs ${IDIR_PIPACS}/usr/bin
diff --git a/package/pipacs/src/Makefile b/package/pipacs/src/Makefile
index 3a48e88f7..c3f830be6 100644
--- a/package/pipacs/src/Makefile
+++ b/package/pipacs/src/Makefile
@@ -1,14 +1,16 @@
-
+CPPFLAGS?=
+CFLAGS?=
+LDFLAGS?=
 EXTRA_CFLAGS := -c -I.
 PIPACS_OBJS := pipacs.o parser.o
 
 all: pipacs
 
 %.o: %.c
-	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -o $@ $^
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -o $@ $^
 
 pipacs: $(PIPACS_OBJS)
-	$(CC) -o $@ $^
+	$(CC) $(LDFLAGS) -o $@ $^
 
 clean:
 	rm -f *.o *.so pipacs
-- 
cgit v1.2.3