summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Herkt <lachs0r@srsfckn.biz>2014-01-08 14:09:17 +0100
committerMartin Herkt <lachs0r@srsfckn.biz>2014-01-08 14:09:17 +0100
commit8b72d2ad7641d9f4320abda94a4b0d15ba6dd74a (patch)
tree6ffbd3b9e12ed45c3f400c3362da6047edac62a3
parentc23a5909547f419f37d62c1f75acf86ab132e32f (diff)
downloadmpv-build-8b72d2ad7641d9f4320abda94a4b0d15ba6dd74a.tar.bz2
mpv-build-8b72d2ad7641d9f4320abda94a4b0d15ba6dd74a.tar.xz
Re-enable building fribidi (with -j1)
This works now that the build scripts are not Makefiles anymore.
-rwxr-xr-xbuild2
-rwxr-xr-xclean1
-rwxr-xr-xscripts/fribidi-build2
-rwxr-xr-xscripts/fribidi-clean3
4 files changed, 7 insertions, 1 deletions
diff --git a/build b/build
index 001fab5..ae7db9f 100755
--- a/build
+++ b/build
@@ -3,6 +3,8 @@ set -e
scripts/ffmpeg-config
scripts/ffmpeg-build $@
+scripts/fribidi-config
+scripts/fribidi-build $@
scripts/libass-config
scripts/libass-build $@
scripts/mpv-config
diff --git a/clean b/clean
index 3a95fbe..a05c19f 100755
--- a/clean
+++ b/clean
@@ -1,6 +1,7 @@
#!/bin/sh
scripts/ffmpeg-clean
+scripts/fribidi-clean
scripts/libass-clean
scripts/mpv-clean
rm -rf build_libs
diff --git a/scripts/fribidi-build b/scripts/fribidi-build
index 6ff54eb..1fe4151 100755
--- a/scripts/fribidi-build
+++ b/scripts/fribidi-build
@@ -1,4 +1,4 @@
#!/bin/sh
set -e
-make -C fribidi install $@
+make -C fribidi install -j1 # race conditions in the make rules
diff --git a/scripts/fribidi-clean b/scripts/fribidi-clean
new file mode 100755
index 0000000..20f7235
--- /dev/null
+++ b/scripts/fribidi-clean
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+make -C fribidi distclean