diff options
| -rw-r--r-- | var/spack/repos/builtin/packages/git-lfs/package.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/git-lfs/patches/issue-10702.patch | 12 |
2 files changed, 14 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/git-lfs/package.py b/var/spack/repos/builtin/packages/git-lfs/package.py index b6c4020dd3..98b52fba0c 100644 --- a/var/spack/repos/builtin/packages/git-lfs/package.py +++ b/var/spack/repos/builtin/packages/git-lfs/package.py @@ -22,6 +22,8 @@ class GitLfs(MakefilePackage): depends_on('go@1.5:', type='build') depends_on('git@1.8.2:', type='run') + patch('patches/issue-10702.patch', when='@2.7.0') + parallel = False # Git-lfs does not provide an 'install' target in the Makefile diff --git a/var/spack/repos/builtin/packages/git-lfs/patches/issue-10702.patch b/var/spack/repos/builtin/packages/git-lfs/patches/issue-10702.patch new file mode 100644 index 0000000000..aad2fe5a04 --- /dev/null +++ b/var/spack/repos/builtin/packages/git-lfs/patches/issue-10702.patch @@ -0,0 +1,12 @@ +--- git-lfs-2.7.0/Makefile 2019-02-15 09:46:44.000000000 -0800 ++++ git-lfs-2.7.0_patched/Makefile 2019-02-25 15:29:41.000000000 -0800 +@@ -29,7 +29,9 @@ + endif + # EXTRA_LD_FLAGS are given by the caller, and are passed to the Go linker after + # BUILTIN_LD_FLAGS are processed. By default the system LDFLAGS are passed. ++ifdef LDFLAGS + EXTRA_LD_FLAGS ?= -extldflags ${LDFLAGS} ++endif + # LD_FLAGS is the union of the above two BUILTIN_LD_FLAGS and EXTRA_LD_FLAGS. + LD_FLAGS = $(BUILTIN_LD_FLAGS) $(EXTRA_LD_FLAGS) + |