mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-29 09:02:46 +00:00
89 lines
2.9 KiB
Diff
89 lines
2.9 KiB
Diff
|
From cccadedfbcb6764a38382154838113a6b2fd4dee Mon Sep 17 00:00:00 2001
|
||
|
|
From: Michael Hoang <enzime@users.noreply.github.com>
|
||
|
|
Date: Mon, 10 Dec 2018 15:08:01 +1100
|
||
|
|
Subject: [PATCH] Patch build.bash for nixpkgs
|
||
|
|
|
||
|
|
---
|
||
|
|
build.bash | 37 ++-----------------------------------
|
||
|
|
1 file changed, 2 insertions(+), 35 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/build.bash b/build.bash
|
||
|
|
index 1588011..72117d9 100755
|
||
|
|
--- a/build.bash
|
||
|
|
+++ b/build.bash
|
||
|
|
@@ -29,7 +29,6 @@ srcd="$(dirname $0)"
|
||
|
|
mudir=$outd/mupdf
|
||
|
|
muinc="-I $mudir/include -I $mudir/thirdparty/freetype/include"
|
||
|
|
|
||
|
|
-test -d "$mudir" || die muPDF not found, consult $(dirname $0)/BUILDING
|
||
|
|
|
||
|
|
mkdir -p $outd/{$wsid,lablGL}
|
||
|
|
:>$outd/ordered
|
||
|
|
@@ -39,12 +38,6 @@ isfresh() { test -r "$1.past" && . "$1.past" && test "$k" = "$2"; }
|
||
|
|
mbt=native
|
||
|
|
mulibs="$mudir/build/$mbt/libmupdf.a" # $mudir/build/$mbt/libmupdf-third.a
|
||
|
|
|
||
|
|
-keycmd="(cd $mudir && git describe --tags --dirty); digest $mulibs"
|
||
|
|
-isfresh "$mulibs" "$(eval $keycmd)" || (
|
||
|
|
- make -C "$mudir" build=$mbt -j $mjobs libs
|
||
|
|
- echo "k='$(eval $keycmd)'" >$mudir/build/$mbt/libmupdf.a.past
|
||
|
|
-) && vecho "fresh mupdf"
|
||
|
|
-
|
||
|
|
oincs() {
|
||
|
|
local i=
|
||
|
|
local incs1=
|
||
|
|
@@ -90,32 +83,6 @@ mflags() {
|
||
|
|
}
|
||
|
|
|
||
|
|
overs="$(ocamlc -vnum 2>/dev/null)" || overs=""
|
||
|
|
-test "$overs" = "4.07.0" || {
|
||
|
|
- url=https://caml.inria.fr/pub/distrib/ocaml-4.07/ocaml-4.07.0.tar.xz
|
||
|
|
- txz=$outd/$(basename $url)
|
||
|
|
- isfresh $txz $url || {
|
||
|
|
- 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
|
||
|
|
- } && vecho "fresh $txz"
|
||
|
|
- absprefix=$(cd $outd &>/dev/null; pwd -P)
|
||
|
|
- export PATH=$absprefix/bin:$PATH
|
||
|
|
- isfresh $absprefix/bin/ocamlc "$url" || (
|
||
|
|
- tar xf $txz -C $outd
|
||
|
|
- bn=$(basename $url)
|
||
|
|
- cd $outd/${bn%.tar.xz}
|
||
|
|
- ./configure -prefix $absprefix \
|
||
|
|
- -no-graph -no-debugger -no-ocamldoc -no-native-compiler
|
||
|
|
- make -j $mjobs world
|
||
|
|
- make install
|
||
|
|
- echo "k='$url'" >$absprefix/bin/ocamlc.past
|
||
|
|
- ) && vecho "fresh ocamlc"
|
||
|
|
- overs=$(ocamlc -vnum 2>/dev/null)
|
||
|
|
-}
|
||
|
|
|
||
|
|
bocaml1() {
|
||
|
|
grep -q "$3" $outd/ordered || {
|
||
|
|
@@ -224,7 +191,7 @@ bobjc() {
|
||
|
|
} && vecho "fresh $o"
|
||
|
|
}
|
||
|
|
|
||
|
|
-ver=$(cd $srcd && git describe --tags --dirty) || ver=unknown
|
||
|
|
+ver=@version@
|
||
|
|
|
||
|
|
cmd="(. $srcd/genconfstr.sh >$outd/confstruct.ml)"
|
||
|
|
keycmd="digest $srcd/genconfstr.sh $outd/confstruct.ml"
|
||
|
|
@@ -278,7 +245,7 @@ for m in ml_gl ml_glarray ml_raw; do
|
||
|
|
done
|
||
|
|
|
||
|
|
libs="str.cma unix.cma"
|
||
|
|
-clibs="-L$mudir/build/$mbt -lmupdf -lmupdf-third -lpthread"
|
||
|
|
+clibs="-lmupdf -lfreetype -lpthread"
|
||
|
|
if $darwin; then
|
||
|
|
mcomp=$(ocamlc -config | grep bytecomp_c_co | { read _ c; echo $c; })
|
||
|
|
clibs="$clibs -framework Cocoa -framework OpenGL"
|
||
|
|
--
|
||
|
|
2.19.2
|
||
|
|
|