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

git-lfs: patch Makefile for v2.7.0 (#10720)

Browse Source 
Fixes #10702

Same fix merged upstream in git-lfs/git-lfs#3545 -- it may appear
in future release v2.7.2 according to package maintainer.
This commit is contained in:
Owen Solberg 2019-02-27 14:02:25 -08:00 committed by Peter Scheibel
parent a25edb51a9
commit fac2dbda07
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
var/spack/repos/builtin/packages/git-lfs/package.py
View File

@ -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

12
var/spack/repos/builtin/packages/git-lfs/patches/issue-10702.patch Normal file
View File

@ -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)