remove uclibc++ support, some libgcc fuckup

4 files changed, 21 insertions, 23 deletions

diff --git a/package/fltk/Makefile b/package/fltk/Makefile
index d7097fa7c..0adfec2f1 100644
--- a/package/fltk/Makefile
+++ b/package/fltk/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		fltk
 PKG_VERSION:=		1.3.2
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_MD5SUM:=		9f7e707d4fb7a5a76f0f9b73ff70623d
 PKG_DESCR:=		fast light toolkit
 PKG_SECTION:=		libs
@@ -13,7 +13,6 @@ PKG_DEPENDS:=		mesalib libx11 libxi freeglut libfreetype
 PKG_BUILDDEP:=		libX11 libXi MesaLib freeglut freetype
 PKG_URL:=		http://www.fltk.org/
 PKG_SITES:=		http://openadk.org/distfiles/
-PKG_CXX:=		LIBFLTK
 PKG_LIBNAME:=		libfltk
 PKG_OPTS:=		dev
 
@@ -25,21 +24,8 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBFLTK,libfltk,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-ifeq ($(ADK_COMPILE_LIBFLTK_WITH_UCLIBCXX),y)
-LIBRARIES:=		-nodefaultlibs -luClibc++ -lm -lc -lgcc
-ifeq ($(ADK_TARGET_USE_SSP),y)
-LIBRARIES+=		-lssp -lssp_nonshared
-endif
-endif
-
 CONFIGURE_ARGS+=	--disable-xinerama
 
-ifeq ($(ADK_COMPILE_LIBFLTK_WITH_UCLIBCXX),y)
-CONFIGURE_ENV+=		CXXFLAGS="${TARGET_CXXFLAGS} -fno-threadsafe-statics -fno-builtin -nostdinc++ \
-			-I${STAGING_TARGET_DIR}/usr/include/uClibc++" \
-			LIBS="$(LIBRARIES)"
-endif
-
 libfltk-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
index 568110189..d6755ba24 100644
--- a/package/fltk/patches/patch-Makefile
+++ b/package/fltk/patches/patch-Makefile
@@ -1,6 +1,6 @@
---- fltk-1.3.0.orig/Makefile	2011-02-15 16:29:03.000000000 +0100
-+++ fltk-1.3.0/Makefile	2011-09-12 20:20:27.137980830 +0200
-@@ -27,7 +27,7 @@
+--- fltk-1.3.2.orig/Makefile	2011-07-19 06:49:30.000000000 +0200
++++ fltk-1.3.2/Makefile	2014-05-28 13:50:10.000000000 +0200
+@@ -18,7 +18,7 @@
  
  include makeinclude
  
diff --git a/package/fltk/patches/patch-configure b/package/fltk/patches/patch-configure
index 0838cce60..c399c416b 100644
--- a/package/fltk/patches/patch-configure
+++ b/package/fltk/patches/patch-configure
@@ -1,6 +1,6 @@
---- fltk-1.3.0.orig/configure	2011-06-16 17:50:44.000000000 +0200
-+++ fltk-1.3.0/configure	2012-07-24 21:03:27.000000000 +0200
-@@ -1792,15 +1792,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+--- fltk-1.3.2.orig/configure	2012-12-09 20:19:15.000000000 +0100
++++ fltk-1.3.2/configure	2014-05-28 13:50:10.000000000 +0200
+@@ -2416,15 +2416,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
  
@@ -16,7 +16,7 @@
  
  FL_MAJOR_VERSION=1
  FL_MINOR_VERSION=3
-@@ -1812,7 +1803,7 @@ FL_API_VERSION=${FL_MAJOR_VERSION}.${FL_
+@@ -2436,7 +2427,7 @@ FL_API_VERSION=${FL_MAJOR_VERSION}.${FL_
  
  
  
@@ -25,7 +25,7 @@
  uversion=`uname -r | sed -e '1,$s/[^0-9]//g'`
  if test "x$uname" = xIRIX64; then
      uname="IRIX"
-@@ -13177,12 +13168,6 @@ echo "Configuration Summary"
+@@ -8145,12 +8136,6 @@ echo "Configuration Summary"
  echo "-------------------------------------------------------------------------"
  
  case $uname_GUI in
diff --git a/package/fltk/patches/patch-makeinclude_in b/package/fltk/patches/patch-makeinclude_in
new file mode 100644
index 000000000..8581117de
--- /dev/null
+++ b/package/fltk/patches/patch-makeinclude_in
@@ -0,0 +1,12 @@
+--- fltk-1.3.2.orig/makeinclude.in	2012-12-05 15:53:03.000000000 +0100
++++ fltk-1.3.2/makeinclude.in	2014-05-28 16:08:25.000000000 +0200
+@@ -130,9 +130,6 @@ INSTALL_SCRIPT	= $(INSTALL) -m 755
+ INSTALL_DESKTOP	= @INSTALL_DESKTOP@
+ UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@
+ 
+-# Be quiet when building...
+-.SILENT:
+-
+ # Build commands and filename extensions...
+ .SUFFIXES:	.0 .1 .3 .6 .c .cxx .mm .h .fl .man .o .z $(EXEEXT)
+