diff --git a/files/0001-Don-t-set-extldflags-unless-LDFLAGS-has-a-value.patch b/files/0001-Don-t-set-extldflags-unless-LDFLAGS-has-a-value.patch new file mode 100644 --- /dev/null +++ b/files/0001-Don-t-set-extldflags-unless-LDFLAGS-has-a-value.patch @@ -0,0 +1,38 @@ +From b1db45694e464dab19695a361dd65947a0832b84 Mon Sep 17 00:00:00 2001 +From: George Hartzell +Date: Mon, 25 Feb 2019 13:19:52 -0800 +Subject: [PATCH] Don't set -extldflags unless LDFLAGS has a value + +Unconditionally setting `-extldflags` to the contents of `LDFLAGS` +causes problems when `LDFLAGS` isn't defined (`-extldflags` doens't +have an corresponding value). + +In out case this led to `git-lfs` aborting. + +``` +$ ./bin/git-lfs +Aborted +``` + +This change only sets `-extldflags` if `LDFLAGS` is defined. +--- + Makefile | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Makefile b/Makefile +index 7ecfee12..cb77898b 100644 +--- a/Makefile ++++ b/Makefile +@@ -29,7 +29,9 @@ BUILTIN_LD_FLAGS += -w + 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) + +-- +2.21.0 + diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,8 +1,8 @@ name : git-lfs -version : 2.1.0 -release : 5 +version : 2.7.1 +release : 6 source : - - https://github.com/git-lfs/git-lfs/archive/v2.1.0.tar.gz : 638e079aab661a8e4d886fd9d4ea728c5e4efcbf657ad4f5497ba39b91e91c08 + - git|https://github.com/git-lfs/git-lfs.git : v2.7.1 homepage : https://git-lfs.github.com license : MIT component : programming.tools @@ -11,6 +11,7 @@ Git LFS is a command line extension for managing large files with Git networking : yes builddeps : + - git - golang - ruby-devel rundeps : @@ -21,9 +22,18 @@ build : | export GEM_PATH=$workdir/gems export PATH=$PATH:$GEM_PATH/bin - ./script/man - ./script/bootstrap + + # the git-lfs makefile uses the system LDFLAGS by default, ypkg sets it up for C/C++ (so don't use it) + unset LDFLAGS + + # https://github.com/git-lfs/git-lfs/commit/b1db45694e464dab19695a361dd65947a0832b84 + %patch -p1 < $pkgfiles/0001-Don-t-set-extldflags-unless-LDFLAGS-has-a-value.patch + + %make + %make man install : | install -Dm755 bin/git-lfs $installdir/usr/bin/git-lfs - install -dm644 $installdir/usr/share/man/man1 + + install -dm644 $installdir/usr/share/man/man{1,5} cp man/*.1 $installdir/usr/share/man/man1 + cp man/*.5 $installdir/usr/share/man/man5 diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -3,15 +3,15 @@ git-lfs https://git-lfs.github.com - Joshua Strobl - joshua@stroblindustries.com + James Lee + jamesl33info@gmail.com MIT programming.tools Git extension for versioning large files Git LFS is a command line extension for managing large files with Git - https://solus-project.com/sources/README.Solus + https://getsol.us/sources/README.Solus git-lfs @@ -20,17 +20,46 @@ programming.tools - /usr/bin - /usr/share/man + /usr/bin/git-lfs + /usr/share/man/man1/git-lfs-checkout.1 + /usr/share/man/man1/git-lfs-clean.1 + /usr/share/man/man1/git-lfs-clone.1 + /usr/share/man/man1/git-lfs-env.1 + /usr/share/man/man1/git-lfs-ext.1 + /usr/share/man/man1/git-lfs-fetch.1 + /usr/share/man/man1/git-lfs-filter-process.1 + /usr/share/man/man1/git-lfs-fsck.1 + /usr/share/man/man1/git-lfs-install.1 + /usr/share/man/man1/git-lfs-lock.1 + /usr/share/man/man1/git-lfs-locks.1 + /usr/share/man/man1/git-lfs-logs.1 + /usr/share/man/man1/git-lfs-ls-files.1 + /usr/share/man/man1/git-lfs-migrate.1 + /usr/share/man/man1/git-lfs-pointer.1 + /usr/share/man/man1/git-lfs-post-checkout.1 + /usr/share/man/man1/git-lfs-post-merge.1 + /usr/share/man/man1/git-lfs-pre-push.1 + /usr/share/man/man1/git-lfs-prune.1 + /usr/share/man/man1/git-lfs-pull.1 + /usr/share/man/man1/git-lfs-push.1 + /usr/share/man/man1/git-lfs-smudge.1 + /usr/share/man/man1/git-lfs-status.1 + /usr/share/man/man1/git-lfs-track.1 + /usr/share/man/man1/git-lfs-uninstall.1 + /usr/share/man/man1/git-lfs-unlock.1 + /usr/share/man/man1/git-lfs-untrack.1 + /usr/share/man/man1/git-lfs-update.1 + /usr/share/man/man1/git-lfs.1 + /usr/share/man/man5/git-lfs-config.5 - - 2017-04-29 - 2.1.0 + + 2019-04-20 + 2.7.1 Packaging update - Joshua Strobl - joshua@stroblindustries.com + James Lee + jamesl33info@gmail.com \ No newline at end of file