From 653905e3a26ac5a0160982f03aac7fd6c3e8804f Mon Sep 17 00:00:00 2001 From: George Hartzell Date: Fri, 22 Jul 2016 19:46:36 -0400 Subject: Add depends_on('perl') to git package This commit changes the git package to depend_on('perl'). The system perl is not always sufficient to install git (e.g. a CentOS7 system with the development tools group installed has perl but not the ExtUtils::MakeMaker package that git needs) and one can't always update the system's perl. This PR depends_on PR #1339, which adds a perl package to spack. --- var/spack/repos/builtin/packages/git/package.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/git/package.py b/var/spack/repos/builtin/packages/git/package.py index 01364580a0..0f2fbc73db 100644 --- a/var/spack/repos/builtin/packages/git/package.py +++ b/var/spack/repos/builtin/packages/git/package.py @@ -55,7 +55,7 @@ class Git(Package): depends_on("zlib") # Use system perl for now. - # depends_on("perl") + depends_on("perl") # depends_on("pcre") def install(self, spec, prefix): @@ -64,8 +64,8 @@ class Git(Package): "--without-pcre", "--with-openssl=%s" % spec['openssl'].prefix, "--with-zlib=%s" % spec['zlib'].prefix, - "--with-curl=%s" % spec['curl'].prefix, - "--with-expat=%s" % spec['expat'].prefix + "--with-expat=%s" % spec['expat'].prefix, + "--with-perl=%s" % join_path(spec['perl'].prefix.bin, 'perl'), ] which('autoreconf')('-i') -- cgit v1.2.3-70-g09d2 From 3cf2fd40a8dd1abede6962317418b33385082f93 Mon Sep 17 00:00:00 2001 From: George Hartzell Date: Sat, 23 Jul 2016 16:18:58 -0400 Subject: Enable depends_on('pcre') also While I have the patient on the operating table, @adamjstewart asked me to uncomment and test the depends_on('pcre'). Did it and it Works For Me(tm). --- var/spack/repos/builtin/packages/git/package.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/git/package.py b/var/spack/repos/builtin/packages/git/package.py index 0f2fbc73db..12b9470434 100644 --- a/var/spack/repos/builtin/packages/git/package.py +++ b/var/spack/repos/builtin/packages/git/package.py @@ -53,10 +53,8 @@ class Git(Package): depends_on("expat") depends_on("gettext") depends_on("zlib") - - # Use system perl for now. + depends_on("pcre") depends_on("perl") - # depends_on("pcre") def install(self, spec, prefix): configure_args = [ -- cgit v1.2.3-70-g09d2 From 152fa33a55550db66f35885dc3da1a38250a1606 Mon Sep 17 00:00:00 2001 From: George Hartzell Date: Tue, 26 Jul 2016 11:13:39 -0400 Subject: Call configure `--with-libpcre=...` to use our pcre An earlier commit claimed that this package depends_on('pcre') but I didn't fix the call to configure that enabled it. This fixes that. --- var/spack/repos/builtin/packages/git/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/git/package.py b/var/spack/repos/builtin/packages/git/package.py index 12b9470434..9570f3f824 100644 --- a/var/spack/repos/builtin/packages/git/package.py +++ b/var/spack/repos/builtin/packages/git/package.py @@ -59,7 +59,7 @@ class Git(Package): def install(self, spec, prefix): configure_args = [ "--prefix=%s" % prefix, - "--without-pcre", + "--with-libpcre=%s" % spec['pcre'].prefix, "--with-openssl=%s" % spec['openssl'].prefix, "--with-zlib=%s" % spec['zlib'].prefix, "--with-expat=%s" % spec['expat'].prefix, -- cgit v1.2.3-70-g09d2 From f699d7c08e1454aa1e1e1bc29c3de583be4897dc Mon Sep 17 00:00:00 2001 From: George Hartzell Date: Tue, 26 Jul 2016 11:15:27 -0400 Subject: [Whitespace] Gather the depends_on's together. --- var/spack/repos/builtin/packages/git/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/git/package.py b/var/spack/repos/builtin/packages/git/package.py index 9570f3f824..5c559eb19c 100644 --- a/var/spack/repos/builtin/packages/git/package.py +++ b/var/spack/repos/builtin/packages/git/package.py @@ -55,6 +55,7 @@ class Git(Package): depends_on("zlib") depends_on("pcre") depends_on("perl") + depends_on("zlib") def install(self, spec, prefix): configure_args = [ -- cgit v1.2.3-70-g09d2 From 1de5817b58553461bfb1ffe39146a31f588a6df8 Mon Sep 17 00:00:00 2001 From: George Hartzell Date: Wed, 3 Aug 2016 20:28:54 -0400 Subject: Clean up rebase problems My rebase duplicated the depends_on('zlib') and dropped the --with-curl from the configure. This fixes those. --- var/spack/repos/builtin/packages/git/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/git/package.py b/var/spack/repos/builtin/packages/git/package.py index 5c559eb19c..e975da5e79 100644 --- a/var/spack/repos/builtin/packages/git/package.py +++ b/var/spack/repos/builtin/packages/git/package.py @@ -55,7 +55,6 @@ class Git(Package): depends_on("zlib") depends_on("pcre") depends_on("perl") - depends_on("zlib") def install(self, spec, prefix): configure_args = [ @@ -63,6 +62,7 @@ class Git(Package): "--with-libpcre=%s" % spec['pcre'].prefix, "--with-openssl=%s" % spec['openssl'].prefix, "--with-zlib=%s" % spec['zlib'].prefix, + "--with-curl=%s" % spec['curl'].prefix, "--with-expat=%s" % spec['expat'].prefix, "--with-perl=%s" % join_path(spec['perl'].prefix.bin, 'perl'), ] -- cgit v1.2.3-70-g09d2 From 9ebbde0e0100b8a9c077d6cb1e67fe7a6b2ec2ec Mon Sep 17 00:00:00 2001 From: George Hartzell Date: Thu, 4 Aug 2016 14:14:08 -0400 Subject: Make configure use our gettext library The configure script needs extra encouragement to link against our gettext/libintl library. --- var/spack/repos/builtin/packages/git/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/git/package.py b/var/spack/repos/builtin/packages/git/package.py index e975da5e79..3cc879088d 100644 --- a/var/spack/repos/builtin/packages/git/package.py +++ b/var/spack/repos/builtin/packages/git/package.py @@ -57,6 +57,7 @@ class Git(Package): depends_on("perl") def install(self, spec, prefix): + env['LDFLAGS'] = "-L%s" % spec['gettext'].prefix.lib + " -lintl" configure_args = [ "--prefix=%s" % prefix, "--with-libpcre=%s" % spec['pcre'].prefix, -- cgit v1.2.3-70-g09d2