[gentoo-commits] gentoo-x86 commit in eclass: gnustep-base.eclass

[Fabian Groffen (grobian)]

grobian     07/09/17 10:58:04

  Modified:             gnustep-base.eclass
  Log:
  avoid setting ld-flags more than once, by querying them first using is-ldflagq

Revision  Changes    Path
1.3                  eclass/gnustep-base.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-base.eclass?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-base.eclass?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-base.eclass?r1=1.2&r2=1.3

Index: gnustep-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnustep-base.eclass	19 Aug 2007 18:15:04 -0000	1.2
+++ gnustep-base.eclass	17 Sep 2007 10:58:04 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v 1.2 2007/08/19 18:15:04 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v 1.3 2007/09/17 10:58:04 grobian Exp $
 
 inherit eutils flag-o-matic
 
@@ -98,15 +98,14 @@
 		# Set rpath in ldflags when available
 		case ${CHOST} in
 			*-linux-gnu|*-solaris*)
-				append-ldflags \
-					-Wl,-rpath="${GNUSTEP_SYSTEM_LIBRARIES}" \
-					-L"${GNUSTEP_SYSTEM_LIBRARIES}"
-			;;
-			*)
-				append-ldflags \
-					-L"${GNUSTEP_SYSTEM_LIBRARIES}"
+				is-ldflagq -Wl,-rpath="${GNUSTEP_SYSTEM_LIBRARIES}" \
+					|| append-ldflags \
+						-Wl,-rpath="${GNUSTEP_SYSTEM_LIBRARIES}"
 			;;
 		esac
+		is-ldflagq -L"${GNUSTEP_SYSTEM_LIBRARIES}" \
+			|| append-ldflags \
+				-L"${GNUSTEP_SYSTEM_LIBRARIES}"
 
 		# Set up env vars for make operations
 		GS_ENV=( AUXILIARY_LDFLAGS="${LDFLAGS}" \



-- 
gentoo-commits@g.o mailing list