summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKelly (KT) Thompson <kgt@lanl.gov>2016-08-03 13:26:02 -0600
committerKelly (KT) Thompson <kgt@lanl.gov>2016-08-03 13:26:02 -0600
commit7c46a4c0e4c255f3c7969d6681cd8fd7c239ed98 (patch)
tree03c12ce63be87c0aff6ed11f692d07f245a612a2
parentd7d12aa2dc5deea4330d13ed73a804d1ab83adcc (diff)
downloadspack-7c46a4c0e4c255f3c7969d6681cd8fd7c239ed98.tar.gz
spack-7c46a4c0e4c255f3c7969d6681cd8fd7c239ed98.tar.bz2
spack-7c46a4c0e4c255f3c7969d6681cd8fd7c239ed98.tar.xz
spack-7c46a4c0e4c255f3c7969d6681cd8fd7c239ed98.zip
Provide minor updates after code review
+ Always depend on the gettext package. This simplifies the logic and I no longer need to 'import sys' + Only apply the patch for the older version of glib.
-rw-r--r--var/spack/repos/builtin/packages/glib/package.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/glib/package.py b/var/spack/repos/builtin/packages/glib/package.py
index 1e5a53ab14..2720831e4f 100644
--- a/var/spack/repos/builtin/packages/glib/package.py
+++ b/var/spack/repos/builtin/packages/glib/package.py
@@ -23,7 +23,6 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
from spack import *
-import sys
class Glib(Package):
@@ -40,12 +39,11 @@ class Glib(Package):
depends_on('libffi')
depends_on('zlib')
depends_on('pkg-config', type='build')
- depends_on('gettext', when=sys.platform == 'darwin')
+ depends_on('gettext')
depends_on('pcre+utf', when='@2.49:')
- depends_on('gettext', when='@2.49:')
# The following patch is needed for gcc-6.1
- patch('g_date_strftime.patch')
+ patch('g_date_strftime.patch', when='@2.42.1')
def url_for_version(self, version):
"""Handle glib's version-based custom URLs."""