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/fltk/Makefile               | 14 ++++++++++++++
 package/fltk/patches/patch-Makefile | 11 +++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 package/fltk/patches/patch-Makefile

(limited to 'package/fltk')

diff --git a/package/fltk/Makefile b/package/fltk/Makefile
index fc2e54ad5..b29de4bc5 100644
--- a/package/fltk/Makefile
+++ b/package/fltk/Makefile
@@ -13,6 +13,9 @@ PKG_BUILDDEP:=		libX11 libXi MesaLib freeglut
 PKG_URL:=		http://www.fltk.org/
 PKG_SITES:=		http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/snapshots/
 
+PKG_NEED_CXX:=		1
+PKG_CXX:=		LIBFLTK
+
 PKG_SUBPKGS:=		LIBFLTK
 PKG_ARCH_DEPENDS:=	x86 x86_64 mips mipsel mips64 mips64el
 
@@ -23,6 +26,17 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBFLTK,libfltk,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc -lm
+ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
+LIBRARIES+=-lssp
+endif
+
+ifeq ($(ADK_COMPILE_LIBFLTK_WITH_UCLIBCXX),y)
+CONFIGURE_ENV+=		CXXFLAGS="-fno-threadsafe-statics -fno-builtin -nostdinc++ \
+			-I${STAGING_TARGET_DIR}/usr/include/uClibc++" \
+			LIBS="$(LIBRARIES)"
+endif
+
 post-install:
 	$(INSTALL_DIR) $(IDIR_LIBFLTK)/usr/lib
 	$(CP) ${WRKINST}/usr/lib/libfltk*.so* $(IDIR_LIBFLTK)/usr/lib
diff --git a/package/fltk/patches/patch-Makefile b/package/fltk/patches/patch-Makefile
new file mode 100644
index 000000000..466aef887
--- /dev/null
+++ b/package/fltk/patches/patch-Makefile
@@ -0,0 +1,11 @@
+--- fltk-2.0.x-r7513.orig/Makefile	2010-04-15 18:29:49.000000000 +0200
++++ fltk-2.0.x-r7513/Makefile	2011-01-14 22:01:49.000000000 +0100
+@@ -25,7 +25,7 @@
+ 
+ include makeinclude
+ 
+-DIRS = src $(LOCALIMAGES) images OpenGL fluid glut test
++DIRS = src $(LOCALIMAGES) images OpenGL fluid
+ 
+ all: makeinclude
+ 	for dir in $(DIRS); do\
-- 
cgit v1.2.3