diff options
| author | Patrick Gartung <gartung@fnal.gov> | 2019-06-04 21:09:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-04 21:09:05 -0500 |
| commit | efa45125fbac8f73c11cb16d7f2944f95137b96d (patch) | |
| tree | d1cbf94f5a0a56b9c71b1fe33abf256cf6d73e5b | |
| parent | 0990f12dd9f22597991f6a08594060deff0bb755 (diff) | |
| download | spack-efa45125fbac8f73c11cb16d7f2944f95137b96d.tar.gz spack-efa45125fbac8f73c11cb16d7f2944f95137b96d.tar.bz2 spack-efa45125fbac8f73c11cb16d7f2944f95137b96d.tar.xz spack-efa45125fbac8f73c11cb16d7f2944f95137b96d.zip | |
Revert "Git: patch to make git relocatable with buildcache. (#11596)" (#11625)
This reverts commit 30ec13f37584ad2934ecdf5a4e86d93d35b3a76c.
| -rw-r--r-- | var/spack/repos/builtin/packages/git/package.py | 16 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/git/patch/relocatable.patch | 42 |
2 files changed, 0 insertions, 58 deletions
diff --git a/var/spack/repos/builtin/packages/git/package.py b/var/spack/repos/builtin/packages/git/package.py index 1692317f9d..8828d68238 100644 --- a/var/spack/repos/builtin/packages/git/package.py +++ b/var/spack/repos/builtin/packages/git/package.py @@ -185,16 +185,6 @@ class Git(AutotoolsPackage): depends_on('m4', type='build') depends_on('tk', type=('build', 'link'), when='+tcltk') - patch('patch/relocatable.patch', 0) - - build_targets = ['NO_INSTALL_HARDLINKS=1', - 'ETC_GITATTRIBUTES=config', - 'ETC_GITCONFIG=config'] - install_targets = ['NO_INSTALL_HARDLINKS=1', - 'ETC_GITATTRIBUTES=config', - 'ETC_GITCONFIG=config', - 'install'] - # See the comment in setup_environment re EXTLIBS. def patch(self): filter_file(r'^EXTLIBS =$', @@ -219,12 +209,6 @@ class Git(AutotoolsPackage): spack_env.append_flags('CFLAGS', '-I{0}'.format( self.spec['gettext'].prefix.include)) - run_env.set('GIT_EXEC_PATH', '%s/git-core' % self.spec.prefix.libexec) - run_env.set('GIT_TEMPLATE_DIR', '%s/git-core/templates' % - self.spec.prefix.share) - run_env.set('GIT_HOME', '%s' % self.spec.prefix) - run_env.set('GITPERLLIB', '%s/perl5' % self.spec.prefix.share) - def configure_args(self): spec = self.spec diff --git a/var/spack/repos/builtin/packages/git/patch/relocatable.patch b/var/spack/repos/builtin/packages/git/patch/relocatable.patch deleted file mode 100644 index 9d698cb7d8..0000000000 --- a/var/spack/repos/builtin/packages/git/patch/relocatable.patch +++ /dev/null @@ -1,42 +0,0 @@ -# Copied from https://cdcvs.fnal.gov/redmine/projects/build-framework/repository/git-ssi-build/revisions/master/entry/patch/git.patch -# curl -o relocatable.patch https://cdcvs.fnal.gov/redmine/projects/build-framework/repository/git-ssi-build/revisions/master/raw/patch/git.patch -diff -Naur config.c config.c ---- config.c 2015-07-15 14:31:07.000000000 -0500 -+++ config.c 2015-07-17 10:33:34.966072446 -0500 -@@ -1153,7 +1153,15 @@ - { - static const char *system_wide; - if (!system_wide) -- system_wide = system_path(ETC_GITCONFIG); -+ /* system_wide = system_path(ETC_GITCONFIG); */ -+ system_wide = ETC_GITCONFIG; -+ if (!is_absolute_path(system_wide)) { -+ /* interpret path relative to exec-dir */ -+ const char *exec_path = git_exec_path(); -+ system_wide = prefix_path(exec_path, strlen(exec_path), -+ system_wide); -+ } -+ - return system_wide; - } - -diff -Naur attr.c attr.c ---- attr.c 2015-07-15 14:31:07.000000000 -0500 -+++ attr.c 2015-07-17 10:33:34.966072446 -0500 -@@ -479,7 +479,15 @@ - { - static const char *system_wide; - if (!system_wide) -- system_wide = system_path(ETC_GITATTRIBUTES); -+ /* system_wide = system_path(ETC_GITATTRIBUTES); */ -+ system_wide = ETC_GITATTRIBUTES; -+ if (!is_absolute_path(system_wide)) { -+ /* interpret path relative to exec-dir */ -+ const char *exec_path = git_exec_path(); -+ system_wide = prefix_path(exec_path, strlen(exec_path), -+ system_wide); -+ } -+ - return system_wide; - } - |