summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorGlenn Johnson <glennpj@gmail.com>2016-09-21 03:56:20 -0500
committerTodd Gamblin <tgamblin@llnl.gov>2016-09-21 01:56:20 -0700
commit73012ec4c875a3f8aa7a0a244d7e3b73466a723e (patch)
tree765e6ac4cbc0cb88803e4d2c22851a3d10cd1da1 /var
parent94b24e88934aae11fd05c77600311ae99c980bc5 (diff)
downloadspack-73012ec4c875a3f8aa7a0a244d7e3b73466a723e.tar.gz
spack-73012ec4c875a3f8aa7a0a244d7e3b73466a723e.tar.bz2
spack-73012ec4c875a3f8aa7a0a244d7e3b73466a723e.tar.xz
spack-73012ec4c875a3f8aa7a0a244d7e3b73466a723e.zip
Rework libgd package (#1679)
* Added missing libtiff dependency * added dependency on fontconfig * Added version 2.2.3 * use autotools rather than cmake The cmake build was not producing a complete install. * There was no versioning of the installed libraries. * gdlib-config was missing * pkgconfig directory was missing These problems do not happen when built with autotools.
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/libgd/package.py35
1 files changed, 25 insertions, 10 deletions
diff --git a/var/spack/repos/builtin/packages/libgd/package.py b/var/spack/repos/builtin/packages/libgd/package.py
index acfdebb972..6329adf8f3 100644
--- a/var/spack/repos/builtin/packages/libgd/package.py
+++ b/var/spack/repos/builtin/packages/libgd/package.py
@@ -40,18 +40,33 @@ class Libgd(Package):
homepage = "https://github.com/libgd/libgd"
url = "https://github.com/libgd/libgd/archive/gd-2.1.1.tar.gz"
+ version('2.2.3', 'a67bd15fa33d4aac0a1c7904aed19f49')
version('2.1.1', 'e91a1a99903e460e7ba00a794e72cc1e')
+ # Build dependencies
+ depends_on('autoconf', type='build')
+ depends_on('automake', type='build')
+ depends_on('libtool', type='build')
+ depends_on('m4', type='build')
+ depends_on('gettext', type='build')
+ depends_on('pkg-config', type='build')
+
depends_on('libpng')
- depends_on('cmake', type='build')
+ depends_on('libtiff')
+ depends_on('fontconfig')
def install(self, spec, prefix):
-
- with working_dir('spack-build', create=True):
- cmake('..',
- '-DENABLE_JPEG:BOOL=ON',
- '-DENABLE_PNG:BOOL=ON',
- '-DENABLE_TIFF:BOOL=ON',
- *std_cmake_args)
- make()
- make("install")
+ autoreconf("--install", "--force",
+ "-I", "m4",
+ "-I", join_path(spec['gettext'].prefix,
+ "share", "aclocal"),
+ "-I", join_path(spec['pkg-config'].prefix,
+ "share", "aclocal"),
+ "-I", join_path(spec['automake'].prefix,
+ "share", "aclocal"),
+ "-I", join_path(spec['libtool'].prefix,
+ "share", "aclocal")
+ )
+ configure('--prefix={0}'.format(prefix))
+ make()
+ make("install")