forked from aufover/rpm-symbiotic
-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathbuild.patch
63 lines (55 loc) · 1.6 KB
/
build.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
# Skip submodule initialisation
--- a/scripts/build-utils.sh
+++ b/scripts/build-utils.sh
@@ -94,12 +94,7 @@
git_submodule_init()
{
- cd "$SRCDIR"
-
- git submodule init || exitmsg "submodule init failed"
- git submodule update || exitmsg "submodule update failed"
-
- cd -
+ true
}
GET="curl -LRO"
# End the build script before the `strip` phase, because everything from this
# point can handle `rpmbuild` on its own.
--- a/scripts/push-to-git.sh
+++ b/scripts/push-to-git.sh
@@ -126,6 +126,8 @@ if [ "$BUILD_Z3" = "yes" ]; then
LIBRARIES="$LIBRARIES $PREFIX/lib/libz3*.so*"
fi
+exit 0
+
#strip binaries, it will save us 500 MB!
for B in $BINARIES $LIBRARIES; do
echo "Stripping $B"
# Use `jsoncpp` from repos (`jsoncpp-devel`).
# This also makes the `rsync` dependency redundant.
diff --git a/system-build.sh b/system-build.sh
index cb4ecff..4660656 100755
--- a/system-build.sh
+++ b/system-build.sh
@@ -189,12 +189,6 @@ check()
MISSING="make $MISSING"
fi
- if ! rsync --version &>/dev/null; then
- # TODO: fix the bootstrap script to use also cp
- echo "sbt-instrumentation needs rsync when bootstrapping json. "
- MISSING="rsync $MISSING"
- fi
-
if ! tar --version &>/dev/null; then
echo "Need tar utility"
MISSING="tar $MISSING"
@@ -382,11 +376,6 @@ if [ $FROM -le 6 ]; then
pushd "$SRCDIR/sbt-instrumentation" || exitmsg "Cloning failed"
- # bootstrap JSON library if needed
- if [ ! -f jsoncpp/dist/jsoncpp.cpp ]; then
- ./bootstrap-json.sh || exitmsg "Failed generating json files"
- fi
-
mkdir -p build-${LLVM_VERSION}
pushd build-${LLVM_VERSION}
if [ ! -d CMakeFiles ]; then