[gentoo-commits] gentoo-x86 commit in eclass: fox.eclass

[Matti Bickel (mabi)]

mabi        10/10/31 22:14:44

  Modified:             fox.eclass
  Log:
  update for use with fox-1.7

Revision  Changes    Path
1.10                 eclass/fox.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fox.eclass?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fox.eclass?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fox.eclass?r1=1.9&r2=1.10

Index: fox.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/fox.eclass,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fox.eclass	18 Sep 2010 11:11:34 -0000	1.9
+++ fox.eclass	31 Oct 2010 22:14:44 -0000	1.10
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/fox.eclass,v 1.9 2010/09/18 11:11:34 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/fox.eclass,v 1.10 2010/10/31 22:14:44 mabi Exp $
 
 # @ECLASS: fox.eclass
 # @MAINTAINER:
@@ -101,6 +101,9 @@
 	# Respect system CXXFLAGS
 	sed -i -e 's:CXXFLAGS=""::' $confFile || die "sed ${confFile} error"
 
+	# don't strip binaries
+	sed -i -e '/LDFLAGS="-s ${LDFLAGS}"/d' $confFile || die "sed ${confFile} error"
+
 	# don't build apps from top-level (i.e. x11-libs/fox)
 	# utils == reswrap
 	local d
@@ -109,9 +112,10 @@
 	done
 
 	# use the installed reswrap for everything else
-	for d in ${FOX_APPS} chart tests ; do
-		sed -i -e 's:$(top_builddir)/utils/reswrap:reswrap:' \
-			${d}/Makefile.am || die "sed ${d}/Makefile.am error"
+	for d in ${FOX_APPS} chart controlpanel tests ; do
+		[[ -d ${d} ]] &&
+		(sed -i -e 's:$(top_builddir)/utils/reswrap:reswrap:' \
+			${d}/Makefile.am || die "sed ${d}/Makefile.am error")
 	done
 
 	# use the installed headers and library for apps