@@ -17,8 +17,11 @@ set -e
17
17
cd " $( dirname " $0 " ) "
18
18
BASE_DIR=" $( pwd) " # set base folder of script location
19
19
20
+ # Determine number of CPU cores for parallel compilation
21
+ CPU_CORES=$( sysctl -n hw.logicalcpu)
22
+
20
23
BUILD_DIR=${BASE_DIR} /../_deps/openvpn_build # work directory
21
- INSTALL_DIR=${BUILD_DIR } /../openvpn_inst
24
+ INSTALL_DIR=${BASE_DIR } /../_deps /openvpn_inst
22
25
23
26
echo " ******** Creating work-folder (${BUILD_DIR} )..."
24
27
rm -rf ${BUILD_DIR}
@@ -40,7 +43,7 @@ echo "************************************************"
40
43
echo " ******** Downloading OpenSSL sources..."
41
44
echo " ************************************************"
42
45
cd ${BUILD_DIR}
43
- curl https://www.openssl.org/source/openssl-${OPEN_SSL_VER} .tar.gz | tar zx
46
+ curl -L https://www.openssl.org/source/openssl-${OPEN_SSL_VER} .tar.gz | tar zx
44
47
45
48
# ##############################################################################
46
49
# Compilation OpenSSl info:
@@ -54,15 +57,15 @@ echo "************************************************"
54
57
cd ${BUILD_DIR} /openssl-${OPEN_SSL_VER}
55
58
56
59
if [ ${_ARCH} = " arm64" ]; then
57
- ./Configure darwin64-arm64-cc shared enable-ec_nistp_64_gcc_128 no-ssl2 no-ssl3 no-comp --openssldir=/usr/local/ssl/macos-arm64
60
+ ./Configure darwin64-arm64-cc shared enable-ec_nistp_64_gcc_128 no-ssl2 no-ssl3 no-comp --openssldir=/usr/local/ssl/macos-arm64 -mmacosx-version-min=10.14
58
61
else
59
- ./Configure darwin64-x86_64-cc shared enable-ec_nistp_64_gcc_128 no-ssl2 no-ssl3 no-comp --openssldir=/usr/local/ssl/macos-x86_64
62
+ ./Configure darwin64-x86_64-cc shared enable-ec_nistp_64_gcc_128 no-ssl2 no-ssl3 no-comp --openssldir=/usr/local/ssl/macos-x86_64 -mmacosx-version-min=10.14
60
63
fi
61
64
62
65
echo " ************************************************"
63
66
echo " ******** Compiling OpenSSL..."
64
67
echo " ************************************************"
65
- make
68
+ make -j $CPU_CORES
66
69
67
70
echo " ************************************************"
68
71
echo " ******** Copying OpenSSL include folder and static libraries..."
@@ -84,25 +87,15 @@ cd lzo-${LZO_VER}
84
87
echo " ************************************************"
85
88
echo " ******** Compiling LZO..."
86
89
echo " ************************************************"
87
- CLFAGS =" -mmacosx-version-min=10.6 " ./configure --prefix=" ${INSTALL_DIR} " && make && make install
90
+ CFLAGS =" -mmacosx-version-min=10.14 " ./configure --prefix=" ${INSTALL_DIR} " && make -j $CPU_CORES && make install
88
91
89
92
echo " ************************************************"
90
- echo " ******** Cloning OpenVPN sources..."
93
+ echo " ******** Cloning OpenVPN sources (version ${OPEN_VPN_VER} ) ..."
91
94
echo " ************************************************"
92
95
cd ${BUILD_DIR}
93
- git clone https://github.com/OpenVPN/openvpn.git
96
+ git clone --branch " ${OPEN_VPN_VER} " --depth 1 https://github.com/OpenVPN/openvpn.git
94
97
cd openvpn
95
98
96
- echo " ************************************************"
97
- echo " ******** Checkout OpenVPN version (${OPEN_VPN_VER} )..."
98
- echo " ************************************************"
99
- git checkout ${OPEN_VPN_VER}
100
-
101
- echo " ************************************************"
102
- echo " ******** Patching OpenVPN..."
103
- echo " ************************************************"
104
- patch -p2 < $BASE_DIR /patches/openvpn-osx-lion.patch
105
-
106
99
echo " ************************************************"
107
100
echo " ******** OpenVPN: Updating generated configuration files..."
108
101
echo " ************************************************"
@@ -111,7 +104,9 @@ autoreconf -ivf
111
104
echo " ************************************************"
112
105
echo " ******** Configuring OpenVPN..."
113
106
echo " ************************************************"
114
- CFLAGS=" -mmacosx-version-min=10.6 -I${INSTALL_DIR} /include" \
107
+ OPENSSL_LIBS=" -L${INSTALL_DIR} /lib -lssl -lcrypto" \
108
+ OPENSSL_CFLAGS=" -I${INSTALL_DIR} /include" \
109
+ CFLAGS=" -mmacosx-version-min=10.14 -I${INSTALL_DIR} /include" \
115
110
LDFLAGS=" -L${INSTALL_DIR} /lib" \
116
111
./configure --disable-debug --disable-server --enable-password-save \
117
112
--disable-lz4
@@ -120,7 +115,7 @@ CFLAGS="-mmacosx-version-min=10.6 -I${INSTALL_DIR}/include" \
120
115
echo " ************************************************"
121
116
echo " ******** Compiling OpenVPN..."
122
117
echo " ************************************************"
123
- make
118
+ make -j $CPU_CORES
124
119
125
120
echo " ********************************"
126
121
echo " ******** BUILD COMPLETE ********"
0 commit comments