Commit 99a2797f authored by Jérome Perrin's avatar Jérome Perrin

component/git: backport a fix for parrallel make

fix this error:

      t/unit-tests/clar/clar.c:209:10: fatal error: clar.suite: No such file or directory
      209 | #include "clar.suite"
            |          ^~~~~~~~~~~~
      compilation terminated.
      make: *** [Makefile:2795: t/unit-tests/clar/clar.o] Error 1
      git: Command 'set -e;make ' returned non-zero exit status 2.
      git: Compilation error. The package is left as is at /srv/slapgrid/slappart47/t/drw/shared/git/832728c0d7e76c5e768f4e3b2767d29d/.build/git-2.47.1 where you can inspect what went wrong.
      A shell script slapos.recipe.build.env.sh has been generated. You can source it in your shell to reproduce build environment.
      While:
      Installing git.
      Error: System error
parent 64283075
...@@ -7,6 +7,7 @@ extends = ...@@ -7,6 +7,7 @@ extends =
../gettext/buildout.cfg ../gettext/buildout.cfg
../libexpat/buildout.cfg ../libexpat/buildout.cfg
../openssl/buildout.cfg ../openssl/buildout.cfg
../patch/buildout.cfg
../pcre/buildout.cfg ../pcre/buildout.cfg
../perl/buildout.cfg ../perl/buildout.cfg
../tar/buildout.cfg ../tar/buildout.cfg
...@@ -33,6 +34,10 @@ environment = ...@@ -33,6 +34,10 @@ environment =
PATH=${curl:location}/bin:${gettext:location}/bin:${tar:location}/bin:${xz-utils:location}/bin:%(PATH)s PATH=${curl:location}/bin:${gettext:location}/bin:${tar:location}/bin:${xz-utils:location}/bin:%(PATH)s
CPPFLAGS=-I${zlib:location}/include CPPFLAGS=-I${zlib:location}/include
LDFLAGS=-L${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${curl:location}/lib -Wl,-rpath=${libexpat:location}/lib LDFLAGS=-L${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${curl:location}/lib -Wl,-rpath=${libexpat:location}/lib
patch-options = -p1
patch-binary = ${patch:location}/bin/patch
patches =
https://github.com/git/git/commit/ea3422662d21c33c349cc71e9cdbfe235e8f6905.patch?full_index=1#0f4d03d2dad5facbdd76a6ac1ef5b057
[gitweb] [gitweb]
<= git <= git
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment