-
Notifications
You must be signed in to change notification settings - Fork 64
/
install.sh.patch
68 lines (63 loc) · 3.28 KB
/
install.sh.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
--- install.sh 2017-10-19 20:46:11.113956620 +0000
+++ install.sh 2017-10-19 20:40:39.850003835 +0000
@@ -17,24 +17,27 @@
cat /proc/cpuinfo | grep flags | head -n 1
fi
-CFLAGS=$ARCH_FLAGS CXXFLAGS=$ARCH_FLAGS CC="ccache clang" CXX="ccache clang" LDFLAGS="-lstdc++" ./configure --prefix=/usr --without-libtool --with-jpeg12 --with-python --with-poppler --with-podofo --with-spatialite --with-mysql --with-liblzma --with-webp --with-java --with-mdb --with-jvm-lib-add-rpath --with-epsilon --with-ecw=/usr/local --with-mrsid=/usr/local --with-mrsid-lidar=/usr/local --with-fgdb=/usr/local --with-libkml --with-null
-# --with-gta
+ln -sf /usr/bin/clang-3.5 /usr/bin/clang
+ln -sf /usr/bin/clang++-3.5 /usr/bin/clang++
+
+CFLAGS=$ARCH_FLAGS CXXFLAGS=$ARCH_FLAGS CC="ccache clang" CXX="ccache clang" LDFLAGS="-lstdc++" ./configure --prefix=/usr --without-libtool --with-jpeg12 --with-python --with-poppler --with-podofo --with-spatialite --with-mysql --with-liblzma --with-webp --with-epsilon --with-ecw=/usr/local --with-mrsid=/usr/local --with-mrsid-lidar=/usr/local --with-fgdb=/usr/local --with-libkml --with-null
+# --with-gta --with-java --with-mdb --with-jvm-lib-add-rpath
# Those ln -s are weird but otherwise Python bindings build fail with clang not being found
-sudo ln -s /usr/local/clang-3.5.0/bin/clang /usr/bin/clang
-sudo ln -s /usr/local/clang-3.5.0/bin/clang++ /usr/bin/clang++
-make USER_DEFS="-Wextra -Werror" -j3
+#sudo ln -s /usr/local/clang-3.5.0/bin/clang /usr/bin/clang
+#sudo ln -s /usr/local/clang-3.5.0/bin/clang++ /usr/bin/clang++
+make USER_DEFS="-Wextra -Werror" -j$(nproc)
cd apps
make USER_DEFS="-Wextra -Werror" test_ogrsf
cd ..
-cd swig/java
-cat java.opt | sed "s/JAVA_HOME =.*/JAVA_HOME = \/usr\/lib\/jvm\/java-8-openjdk-amd64\//" > java.opt.tmp
-mv java.opt.tmp java.opt
-export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
-export PATH=$JAVA_HOME/jre/bin:$PATH
-java -version
-make
-cd ../..
+#cd swig/java
+#cat java.opt | sed "s/JAVA_HOME =.*/JAVA_HOME = \/usr\/lib\/jvm\/java-8-openjdk-amd64\//" > java.opt.tmp
+#mv java.opt.tmp java.opt
+#export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
+#export PATH=$JAVA_HOME/jre/bin:$PATH
+#java -version
+#make
+#cd ../..
cd swig/perl
make generate
make
@@ -45,9 +48,9 @@
sudo ldconfig
cd fuzzers
-make USER_DEFS="-Wextra -Werror" -j3
+make USER_DEFS="-Wextra -Werror" -j$(nproc)
cd tests
-make USER_DEFS="-Wextra -Werror" -j3 check
+make USER_DEFS="-Wextra -Werror" -j$(nproc) check
cd ..
cd ..
@@ -55,8 +58,8 @@
if grep override /usr/include/gdal*.h /usr/include/ogr*.h /usr/include/gnm*.h /usr/include/cpl*.h | grep -v "One can override" | grep -v cpl_port | grep -v "Use this file to override"; then echo "Error: override keyword found in public headers instead of CPL_OVERRIDE" && /bin/false; fi
cd ../autotest/cpp
-make -j3
+make -j$(nproc)
cd ../../gdal
-wget https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mdb-sqlite/mdb-sqlite-1.0.2.tar.bz2
-tar xjvf mdb-sqlite-1.0.2.tar.bz2
-sudo cp mdb-sqlite-1.0.2/lib/*.jar /usr/lib/jvm/java-7-openjdk-amd64/jre/lib/ext
+#wget https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mdb-sqlite/mdb-sqlite-1.0.2.tar.bz2
+#tar xjvf mdb-sqlite-1.0.2.tar.bz2
+#sudo cp mdb-sqlite-1.0.2/lib/*.jar /usr/lib/jvm/java-7-openjdk-amd64/jre/lib/ext