diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/misc/llpp/fix-build-bash.patch')
| -rw-r--r-- | nixpkgs/pkgs/applications/misc/llpp/fix-build-bash.patch | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/nixpkgs/pkgs/applications/misc/llpp/fix-build-bash.patch b/nixpkgs/pkgs/applications/misc/llpp/fix-build-bash.patch index 13dbdb926c8..fbc341c8af7 100644 --- a/nixpkgs/pkgs/applications/misc/llpp/fix-build-bash.patch +++ b/nixpkgs/pkgs/applications/misc/llpp/fix-build-bash.patch @@ -17,48 +17,48 @@ index 7c278b6..41494c5 100755 -keycmd="(cd $mudir && make -q build=$mbt libs && echo); digest $mulibs" -isfresh "$mulibs" "$(eval $keycmd)" || ( - make -C "$mudir" build=$mbt -j $mjobs libs -- echo "k='$(eval $keycmd)'" >$mudir/build/$mbt/libmupdf.a.past +- eval $keycmd >$mudir/build/$mbt/libmupdf.a.past -) && vecho "fresh mupdf" - oincs() { local i= local incs1= -@@ -90,34 +83,6 @@ mflags() { +@@ -89,34 +82,6 @@ mflags() { } overs="$(ocamlc -vnum 2>/dev/null)" || overs="" --test "$overs" = "4.08" || { -- url=https://caml.inria.fr/pub/distrib/ocaml-4.08/ocaml-4.08.0.tar.xz +-test "$overs" = "4.10.0" || { +- url=https://caml.inria.fr/pub/distrib/ocaml-4.10/ocaml-4.10.0.tar.xz - txz=$outd/$(basename $url) -- isfresh $txz $url || { +- keycmd="printf $url; digest $txz;" +- isfresh $txz "$(eval $keycmd)" || { - executable_p() { command -v "$1" >/dev/null 2>&1; } - if executable_p wget; then dl() { wget -q "$1" -O "$2"; } - elif executable_p curl; then dl() { curl -L "$1" -o "$2"; } - else die "no program to fetch remote urls found" - fi - dl $url $txz -- echo "k=$url" >$txz.past +- eval $keycmd >$txz.past - } && vecho "fresh $txz" - absprefix=$(cd $outd &>/dev/null; pwd -P) - export PATH=$absprefix/bin:$PATH -- isfresh $absprefix/bin/ocamlc "$url" || ( +- ocamlc=$absprefix/bin/ocamlc +- keycmd="printf $url; digest $ocamlc;" +- isfresh $ocamlc "$(eval $keycmd)" || ( - tar xf $txz -C $outd - bn=$(basename $url) - cd $outd/${bn%.tar.xz} -- ./configure --disable-vmthreads --disable-graph-lib \ -- --disable-ocamldoc --enable-debugger=no \ -- --disable-flat-float-array \ -- --prefix=$absprefix +- ./configure --disable-ocamldoc --enable-debugger=no --prefix=$absprefix - make -j $mjobs world - make install -- echo "k='$url'" >$absprefix/bin/ocamlc.past +- eval $keycmd >$absprefix/bin/ocamlc.past - ) && vecho "fresh ocamlc" - overs=$(ocamlc -vnum 2>/dev/null) -} - bocaml1() { - grep -q "$3" $outd/ordered || { -@@ -227,7 +192,7 @@ bobjc() { + ccomp=${LLPP_CC-$(ocamlc -config | grep "^c_compiler: " | \ + { read _ c; echo $c; })} +@@ -230,7 +195,7 @@ bobjc() { } && vecho "fresh $o" } @@ -67,7 +67,7 @@ index 7c278b6..41494c5 100755 cmd="(. $srcd/genconfstr.sh >$outd/confstruct.ml)" keycmd="digest $srcd/genconfstr.sh $outd/confstruct.ml" -@@ -281,7 +246,7 @@ for m in ml_gl ml_glarray ml_raw; do +@@ -284,7 +249,7 @@ for m in ml_gl ml_glarray ml_raw; do done libs="str.cma unix.cma" |