[patch] Address some issues in the current openoffice-3.0.0.ebuild

openoffice-3.0.0.ebuild.patch (text/plain), 1.04 KB, created by Gordon Malm (RETIRED) on 2008-10-22 15:49:12 UTC

--- openoffice-3.0.0.ebuild
+++ openoffice-3.0.0-patched.ebuild
@@ -6,7 +6,7 @@
 WANT_AUTOMAKE="1.9"
 EAPI="1"
 
-inherit autotools check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functions mono multilib
+inherit autotools check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functions mono multilib toolchain-funcs
 
 IUSE="cups dbus debug eds gnome gstreamer gtk kde ldap mono nsplugin odk opengl pam templates"
 
@@ -324,16 +324,14 @@
 	filter-flags "-fstack-protector"
 	filter-flags "-fstack-protector-all"
 	filter-flags "-ftracer"
-
-	if has_version <=sys-devel/gcc-3.4.7 ; then
-		use hardened || filter-flags "-fforce-addr"
-		is-flag -fomit-frame-pointer && append-flags "-momit-leaf-frame-pointer"
-	else
-		filter-flags "-fforce-addr"
-	fi
+	filter-flags "-fforce-addr"
 
 	filter-flags "-O[s2-9]"
 
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		replace-flags "-fomit-frame-pointer" "-momit-leaf-frame-pointer"
+	fi
+
 	# Build with NVidia cards breaks otherwise
 	use opengl && append-flags "-DGL_GLEXT_PROTOTYPES"