@@ -27,6 +27,11 @@ read -rp $'\nDo you want to strip the binaries after build? (y/n): ' STRIP_BIN
27
27
# 3. Create .app + .dmg?
28
28
read -rp $' \n Do you want to create a .app and DMG for Qt Wallet? (y/n): ' MAKE_DMG
29
29
30
+ # --------------------------
31
+ # Environment PATH fallback
32
+ # --------------------------
33
+ export PATH=" /usr/local/bin:/opt/homebrew/bin:$PATH "
34
+
30
35
# --------------------------
31
36
# Dependencies
32
37
# --------------------------
@@ -43,6 +48,7 @@ PROTOBUF_URL="https://github.com/protocolbuffers/protobuf/releases/download/v3.6
43
48
if [ ! -f " $PROTOBUF_DIR /bin/protoc" ]; then
44
49
echo -e " ${GREEN} >>> Installing Protobuf 3.6.1 (compatible version)...${RESET} "
45
50
mkdir -p " $HOME /local"
51
+ CUR_DIR=" $( pwd) "
46
52
cd /tmp
47
53
curl -LO " $PROTOBUF_URL "
48
54
tar -xvf " $PROTOBUF_TAR "
@@ -51,6 +57,7 @@ if [ ! -f "$PROTOBUF_DIR/bin/protoc" ]; then
51
57
make -j" $( sysctl -n hw.logicalcpu) "
52
58
make install
53
59
echo -e " ${CYAN} ✔ Installed Protobuf 3.6.1 to $PROTOBUF_DIR ${RESET} "
60
+ cd " $CUR_DIR "
54
61
else
55
62
echo -e " ${CYAN} ✔ Protobuf 3.6.1 already installed at $PROTOBUF_DIR ${RESET} "
56
63
fi
@@ -60,8 +67,8 @@ export PATH="$PROTOBUF_DIR/bin:$PATH"
60
67
export LD_LIBRARY_PATH=" $PROTOBUF_DIR /lib:$LD_LIBRARY_PATH "
61
68
export PKG_CONFIG_PATH=" $PROTOBUF_DIR /lib/pkgconfig:$PKG_CONFIG_PATH "
62
69
export PROTOC=" $PROTOBUF_DIR /bin/protoc"
63
-
64
- cd " $OLDPWD "
70
+ export LDFLAGS= " -L $PROTOBUF_DIR /lib $LDFLAGS "
71
+ export CPPFLAGS= " -I $PROTOBUF_DIR /include $CPPFLAGS "
65
72
66
73
# --------------------------
67
74
# AdventureCoin source
@@ -139,7 +146,6 @@ export CXXFLAGS="-std=c++11"
139
146
# --------------------------
140
147
echo -e " ${GREEN} >>> Applying macOS compatibility patches...${RESET} "
141
148
142
- # Boost global placeholder patch
143
149
BOOST_FILES=(" src/init.cpp" " src/torcontrol.cpp" " src/validation.cpp" " src/validationinterface.cpp" " src/scheduler.cpp" )
144
150
for FILE in " ${BOOST_FILES[@]} " ; do
145
151
if ! grep -q " BOOST_BIND_GLOBAL_PLACEHOLDERS" " $FILE " ; then
@@ -150,7 +156,6 @@ for FILE in "${BOOST_FILES[@]}"; do
150
156
fi
151
157
done
152
158
153
- # is_complete -> is_absolute fix
154
159
PROTOCOL_CPP=" rpc/protocol.cpp"
155
160
if grep -q ' is_complete' " $PROTOCOL_CPP " ; then
156
161
echo -e " ${GREEN} >>> Patching deprecated is_complete() in $PROTOCOL_CPP ...${RESET} "
@@ -176,7 +181,7 @@ elif [[ "$BUILD_CHOICE" == "3" ]]; then
176
181
./configure $CONFIGURE_ARGS --disable-wallet --with-gui=qt5
177
182
fi
178
183
179
- make -j" $( sysctl -n hw.ncpu ) "
184
+ make -j" $( sysctl -n hw.logicalcpu ) "
180
185
181
186
mkdir -p " $COMPILED_DIR "
182
187
[[ " $BUILD_CHOICE " =~ [12] ]] && cp src/adventurecoind src/adventurecoin-cli src/adventurecoin-tx " $COMPILED_DIR /" 2> /dev/null || true
@@ -219,7 +224,7 @@ if [[ "$MAKE_DMG" =~ ^[Yy]$ && -f "$COMPILED_DIR/adventurecoin-qt" ]]; then
219
224
EOF
220
225
221
226
echo -e " ${GREEN} >>> Running macdeployqt...${RESET} "
222
- macdeployqt " $APP_BUNDLE_DIR " || echo -e " ${RED} ✖ macdeployqt failed (ensure Qt is in PATH) ${RESET} "
227
+ macdeployqt " $APP_BUNDLE_DIR " || { echo -e " ${RED} ✖ macdeployqt failed. Ensure Qt is in PATH and compatible. ${RESET} " ; exit 1 ; }
223
228
224
229
echo -e " ${GREEN} >>> Creating DMG...${RESET} "
225
230
DMG_PATH=" ${COMPILED_DIR} /AdventureCoin-Wallet.dmg"
0 commit comments