zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Provide minor updates after code review

Browse Source 
+ 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.
This commit is contained in:
Kelly (KT) Thompson
2016-08-03 13:26:02 -06:00
parent d7d12aa2dc
commit 7c46a4c0e4
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
var/spack/repos/builtin/packages/glib/package.py
View File

@@ -23,7 +23,6 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
############################################################################## ##############################################################################
from spack import * from spack import *
import sys
class Glib(Package): class Glib(Package):
@@ -40,12 +39,11 @@ class Glib(Package):
depends_on('libffi') depends_on('libffi')
depends_on('zlib') depends_on('zlib')
depends_on('pkg-config', type='build') 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('pcre+utf', when='@2.49:')
depends_on('gettext', when='@2.49:')
# The following patch is needed for gcc-6.1 # 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): def url_for_version(self, version):
"""Handle glib's version-based custom URLs.""" """Handle glib's version-based custom URLs."""