From c2bd3a43342e37a05a97e12581dd2bd52993877a Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 31 Mar 2011 20:20:09 +0200
Subject: Revert "fix conflict, autoseect libgcj"

This reverts commit ac46bdeef28bc2b65e1880884a79257c28e423a7, reversing
changes made to 418fb3668f7140cc3e2ba07c354fe0d9bbb47d04.
---
 package/cxxtools/Makefile | 1 -
 1 file changed, 1 deletion(-)

(limited to 'package/cxxtools')

diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile
index 916bf8c94..812d17ea2 100644
--- a/package/cxxtools/Makefile
+++ b/package/cxxtools/Makefile
@@ -24,7 +24,6 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,CXXTOOLS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,CXXTOOLS_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y)
 TARGET_CXXFLAGS+=	-fno-builtin -nostdinc++ \
 			-I${STAGING_TARGET_DIR}/usr/include/uClibc++ -Wl,-E
-- 
cgit v1.2.3


From f4e50548b0d41f5b4e6faae3ddc7283dd1a5dd6c Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 31 Mar 2011 20:21:13 +0200
Subject: I am to tupid for git, today.

Revert "Revert "fix conflict, autoseect libgcj""

This reverts commit c2bd3a43342e37a05a97e12581dd2bd52993877a.
---
 package/cxxtools/Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'package/cxxtools')

diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile
index 812d17ea2..916bf8c94 100644
--- a/package/cxxtools/Makefile
+++ b/package/cxxtools/Makefile
@@ -24,6 +24,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,CXXTOOLS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,CXXTOOLS_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y)
 TARGET_CXXFLAGS+=	-fno-builtin -nostdinc++ \
 			-I${STAGING_TARGET_DIR}/usr/include/uClibc++ -Wl,-E
-- 
cgit v1.2.3


From bd015df1e472968ad28099544740f7b7e514312e Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 31 Mar 2011 22:27:39 +0200
Subject: add lxde components, update libpng and firefox

---
 package/cxxtools/patches/patch-ltmain_sh | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 package/cxxtools/patches/patch-ltmain_sh

(limited to 'package/cxxtools')

diff --git a/package/cxxtools/patches/patch-ltmain_sh b/package/cxxtools/patches/patch-ltmain_sh
new file mode 100644
index 000000000..e25e29b9e
--- /dev/null
+++ b/package/cxxtools/patches/patch-ltmain_sh
@@ -0,0 +1,11 @@
+--- cxxtools-1.4.8.orig/ltmain.sh	2007-08-14 20:05:31.000000000 +0200
++++ cxxtools-1.4.8/ltmain.sh	2011-03-28 20:40:30.691818463 +0200
+@@ -1663,7 +1663,7 @@ EOF
+       # -F/path gives path to uninstalled frameworks, gcc on darwin
+       # @file GCC response files
+       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
++      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
+ 
+ 	# Unknown arguments in both finalize_command and compile_command need
+ 	# to be aesthetically quoted because they are evaled later.
-- 
cgit v1.2.3