| 1 |
slyfox 13/11/20 09:19:19 |
| 2 |
|
| 3 |
Modified: ChangeLog haskell-cabal.eclass |
| 4 |
Log: |
| 5 |
Added 'replace-hcflags()'. Filters HCFLAGS. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.1062 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1062&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1062&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1061&r2=1.1062 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.1061 |
| 18 |
retrieving revision 1.1062 |
| 19 |
diff -u -r1.1061 -r1.1062 |
| 20 |
--- ChangeLog 20 Nov 2013 06:09:43 -0000 1.1061 |
| 21 |
+++ ChangeLog 20 Nov 2013 09:19:19 -0000 1.1062 |
| 22 |
@@ -1,6 +1,9 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1061 2013/11/20 06:09:43 nerdboy Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1062 2013/11/20 09:19:19 slyfox Exp $ |
| 27 |
+ |
| 28 |
+ 20 Nov 2013; Sergei Trofimovich <slyfox@g.o> haskell-cabal.eclass: |
| 29 |
+ Added 'replace-hcflags()'. Filters HCFLAGS. |
| 30 |
|
| 31 |
20 Nov 2013; Steve Arnold <nerdboy@g.o> gnatbuild.eclass: |
| 32 |
Updated to strip graphite flags (all arches) and enable the openmp USE |
| 33 |
|
| 34 |
|
| 35 |
|
| 36 |
1.42 eclass/haskell-cabal.eclass |
| 37 |
|
| 38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.42&view=markup |
| 39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.42&content-type=text/plain |
| 40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?r1=1.41&r2=1.42 |
| 41 |
|
| 42 |
Index: haskell-cabal.eclass |
| 43 |
=================================================================== |
| 44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v |
| 45 |
retrieving revision 1.41 |
| 46 |
retrieving revision 1.42 |
| 47 |
diff -u -r1.41 -r1.42 |
| 48 |
--- haskell-cabal.eclass 29 Jul 2013 12:31:35 -0000 1.41 |
| 49 |
+++ haskell-cabal.eclass 20 Nov 2013 09:19:19 -0000 1.42 |
| 50 |
@@ -1,6 +1,6 @@ |
| 51 |
# Copyright 1999-2013 Gentoo Foundation |
| 52 |
# Distributed under the terms of the GNU General Public License v2 |
| 53 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.41 2013/07/29 12:31:35 slyfox Exp $ |
| 54 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.42 2013/11/20 09:19:19 slyfox Exp $ |
| 55 |
|
| 56 |
# @ECLASS: haskell-cabal.eclass |
| 57 |
# @MAINTAINER: |
| 58 |
@@ -638,3 +638,25 @@ |
| 59 |
echo "${new_c}" > "$cf" || |
| 60 |
die "failed to update" |
| 61 |
} |
| 62 |
+ |
| 63 |
+# @FUNCTION: replace-hcflags |
| 64 |
+# @USAGE: <old> <new> |
| 65 |
+# @DESCRIPTION: |
| 66 |
+# Replace the <old> flag with <new> in HCFLAGS. Accepts shell globs for <old>. |
| 67 |
+# The implementation is picked from flag-o-matic.eclass:replace-flags() |
| 68 |
+replace-hcflags() { |
| 69 |
+ [[ $# != 2 ]] && die "Usage: replace-hcflags <old flag> <new flag>" |
| 70 |
+ |
| 71 |
+ local f new=() |
| 72 |
+ for f in ${HCFLAGS} ; do |
| 73 |
+ # Note this should work with globs like -O* |
| 74 |
+ if [[ ${f} == ${1} ]]; then |
| 75 |
+ einfo "HCFLAGS: replacing '${f}' to '${2}'" |
| 76 |
+ f=${2} |
| 77 |
+ fi |
| 78 |
+ new+=( "${f}" ) |
| 79 |
+ done |
| 80 |
+ export HCFLAGS="${new[*]}" |
| 81 |
+ |
| 82 |
+ return 0 |
| 83 |
+} |
Archives