Skip to content

Commit 26613d8

Browse files
committed
prefer CMAKE_INSTALL_PREFIX over --prefix
1 parent 8806267 commit 26613d8

File tree

13 files changed

+26
-14
lines changed

13 files changed

+26
-14
lines changed

boringssl.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,13 @@ _VER="$1"
139139
# shellcheck disable=SC2086
140140
cmake -B "${_BLDDIR}" ${_CMAKE_GLOBAL} ${_CMAKE_CXX_GLOBAL} ${_CMAKE_ASM_GLOBAL} ${options} \
141141
-DBUILD_SHARED_LIBS=OFF \
142+
-DCMAKE_INSTALL_PREFIX="${PWD}/${_PP}" \
142143
-DCMAKE_C_FLAGS="${_CFLAGS_GLOBAL_CMAKE} ${_CFLAGS_GLOBAL} ${_CPPFLAGS_GLOBAL} ${CFLAGS} ${CPPFLAGS} ${_LDFLAGS_GLOBAL} ${LIBS}" \
143144
-DCMAKE_CXX_FLAGS="${_CFLAGS_GLOBAL_CMAKE} ${_CFLAGS_GLOBAL} ${_CPPFLAGS_GLOBAL} ${CFLAGS} ${CPPFLAGS} ${_LDFLAGS_GLOBAL} ${LIBS} ${_CXXFLAGS_GLOBAL} ${_LDFLAGS_CXX_GLOBAL}"
144145
fi
145146

146147
cmake --build "${_BLDDIR}" # --verbose
147-
cmake --install "${_BLDDIR}" --prefix "${_PP}"
148+
cmake --install "${_BLDDIR}"
148149

149150
# List files created
150151
find "${_PP}"

brotli.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@ _VER="$1"
2020
cmake -B "${_BLDDIR}" ${_CMAKE_GLOBAL} \
2121
-DBUILD_SHARED_LIBS=OFF \
2222
-DBROTLI_DISABLE_TESTS=ON \
23+
-DCMAKE_INSTALL_PREFIX="${PWD}/${_PP}" \
2324
-DCMAKE_C_FLAGS="${_CFLAGS_GLOBAL_CMAKE} ${_CFLAGS_GLOBAL} ${_CPPFLAGS_GLOBAL} ${_LDFLAGS_GLOBAL}"
2425

2526
cmake --build "${_BLDDIR}"
26-
cmake --install "${_BLDDIR}" --prefix "${_PP}"
27+
cmake --install "${_BLDDIR}"
2728

2829
# libcurl does not need the encoding functionality
2930
rm -f "${_PP}"/include/encode.h

cares.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,11 @@ _VER="$1"
4848
-DCARES_BUILD_TESTS=OFF \
4949
-DCARES_BUILD_CONTAINER_TESTS=OFF \
5050
-DCARES_BUILD_TOOLS=OFF \
51+
-DCMAKE_INSTALL_PREFIX="${PWD}/${_PP}" \
5152
-DCMAKE_C_FLAGS="${_CFLAGS_GLOBAL_CMAKE} ${_CFLAGS_GLOBAL} ${_CPPFLAGS_GLOBAL} ${_LDFLAGS_GLOBAL}"
5253

5354
cmake --build "${_BLDDIR}"
54-
cmake --install "${_BLDDIR}" --prefix "${_PP}"
55+
cmake --install "${_BLDDIR}"
5556

5657
# Delete .pc files
5758
rm -r -f "${_PP}"/lib/pkgconfig

curl.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,7 @@ _VER="$1"
386386
-DBUILD_SHARED_LIBS=ON \
387387
-DBUILD_STATIC_LIBS=ON \
388388
-DCURL_HIDDEN_SYMBOLS=ON \
389+
-DCMAKE_INSTALL_PREFIX="${PWD}/${_PP}" \
389390
-DCMAKE_RC_FLAGS="${_RCFLAGS_GLOBAL}" \
390391
-DCMAKE_C_FLAGS="${_CFLAGS_GLOBAL_CMAKE} ${_CFLAGS_GLOBAL} ${_CPPFLAGS_GLOBAL} ${CPPFLAGS} ${_LDFLAGS_GLOBAL}" \
391392
-DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS} ${LDFLAGS_BIN} ${LIBS}" \
@@ -399,7 +400,7 @@ _VER="$1"
399400
fi
400401
401402
TZ=UTC cmake --build "${_BLDDIR}" --verbose
402-
TZ=UTC cmake --install "${_BLDDIR}" --prefix "${_PP}"
403+
TZ=UTC cmake --install "${_BLDDIR}"
403404
404405
if [[ "${_CONFIG}" = *'curltests'* ]]; then
405406
TZ=UTC cmake --build "${_BLDDIR}" --target testdeps

libressl.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ _VER="$1"
7878
-DBUILD_SHARED_LIBS=OFF \
7979
-DLIBRESSL_APPS=OFF \
8080
-DLIBRESSL_TESTS=OFF \
81+
-DCMAKE_INSTALL_PREFIX="${PWD}/${_PP}" \
8182
-DCMAKE_C_FLAGS="${_CFLAGS_GLOBAL_CMAKE} ${_CFLAGS_GLOBAL} ${_CPPFLAGS_GLOBAL} ${CFLAGS} ${CPPFLAGS} ${_LDFLAGS_GLOBAL}" \
8283
-DCMAKE_ASM_FLAGS="${_CFLAGS_GLOBAL_CMAKE} ${_CFLAGS_GLOBAL} ${_CPPFLAGS_GLOBAL} ${CFLAGS} ${CPPFLAGS} ${_LDFLAGS_GLOBAL}"
8384

@@ -88,7 +89,7 @@ _VER="$1"
8889
# ignores --prefix for /etc/ssl config files and fails when writing them.
8990
DESTDIR="${_PKGDIR}" cmake --install "${_BLDDIR}"
9091
else
91-
cmake --install "${_BLDDIR}" --prefix "${_PP}"
92+
cmake --install "${_BLDDIR}"
9293
fi
9394

9495
# Delete .pc files

libssh.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,12 @@ _VER="$1"
110110
-DWITH_SERVER=OFF \
111111
-DWITH_EXAMPLES=OFF \
112112
-DUNIT_TESTING=OFF \
113+
-DCMAKE_INSTALL_PREFIX="${PWD}/${_PPS}" \
113114
-DCMAKE_C_FLAGS="${_CFLAGS_GLOBAL_CMAKE} ${_CFLAGS_GLOBAL} ${_CPPFLAGS_GLOBAL} ${CPPFLAGS} ${_LDFLAGS_GLOBAL} ${LIBS}" \
114115
-DCMAKE_CXX_FLAGS="${_CFLAGS_GLOBAL_CMAKE} ${_CFLAGS_GLOBAL} ${_CPPFLAGS_GLOBAL} ${CPPFLAGS} ${_LDFLAGS_GLOBAL} ${LIBS} ${_CXXFLAGS_GLOBAL} ${_LDFLAGS_CXX_GLOBAL}"
115116

116117
cmake --build "${_BLDDIR}"
117-
cmake --install "${_BLDDIR}" --prefix "${_PPS}"
118+
cmake --install "${_BLDDIR}"
118119

119120
# Make steps for determinism
120121

libssh2.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,12 @@ _VER="$1"
5555
-DBUILD_TESTING=OFF \
5656
-DENABLE_DEBUG_LOGGING=OFF \
5757
-DLIBSSH2_NO_DEPRECATED=ON \
58+
-DCMAKE_INSTALL_PREFIX="${PWD}/${_PPS}" \
5859
-DCMAKE_C_FLAGS="${_CFLAGS_GLOBAL_CMAKE} ${_CFLAGS_GLOBAL} ${_CPPFLAGS_GLOBAL} ${LIBSSH2_CPPFLAGS} ${_LDFLAGS_GLOBAL} ${LIBS}" # --debug-trycompile
5960
fi
6061

6162
cmake --build "${_BLDDIR}"
62-
cmake --install "${_BLDDIR}" --prefix "${_PPS}"
63+
cmake --install "${_BLDDIR}"
6364

6465
# Delete .pc files
6566
rm -r -f "${_PPS}"/lib/pkgconfig

nghttp2.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,11 @@ _VER="$1"
3232
-DBUILD_STATIC_LIBS=ON \
3333
-DBUILD_SHARED_LIBS=OFF \
3434
-DBUILD_TESTING=OFF \
35+
-DCMAKE_INSTALL_PREFIX="${PWD}/${_PP}" \
3536
-DCMAKE_C_FLAGS="${_CFLAGS_GLOBAL_CMAKE} ${_CFLAGS_GLOBAL} ${_CPPFLAGS_GLOBAL} ${CPPFLAGS} ${_LDFLAGS_GLOBAL}"
3637

3738
cmake --build "${_BLDDIR}"
38-
cmake --install "${_BLDDIR}" --prefix "${_PP}"
39+
cmake --install "${_BLDDIR}"
3940

4041
# Delete .pc files
4142
rm -r -f "${_PP}"/lib/pkgconfig

nghttp3.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,12 @@ _VER="$1"
3333
-DENABLE_STATIC_LIB=ON \
3434
-DENABLE_SHARED_LIB=OFF \
3535
-DBUILD_TESTING=OFF \
36+
-DCMAKE_INSTALL_PREFIX="${PWD}/${_PP}" \
3637
-DCMAKE_C_FLAGS="${_CFLAGS_GLOBAL_CMAKE} ${_CFLAGS_GLOBAL} ${_CPPFLAGS_GLOBAL} ${CPPFLAGS} ${_LDFLAGS_GLOBAL}" \
3738
-DCMAKE_CXX_FLAGS="${_CFLAGS_GLOBAL_CMAKE} ${_CFLAGS_GLOBAL} ${_CPPFLAGS_GLOBAL} ${CPPFLAGS} ${_LDFLAGS_GLOBAL} ${_CXXFLAGS_GLOBAL} ${_LDFLAGS_CXX_GLOBAL}"
3839

3940
cmake --build "${_BLDDIR}"
40-
cmake --install "${_BLDDIR}" --prefix "${_PP}"
41+
cmake --install "${_BLDDIR}"
4142

4243
# Delete .pc files
4344
rm -r -f "${_PP}"/lib/pkgconfig

ngtcp2.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,12 @@ _VER="$1"
6060
-DENABLE_STATIC_LIB=ON \
6161
-DENABLE_SHARED_LIB=OFF \
6262
-DBUILD_TESTING=OFF \
63+
-DCMAKE_INSTALL_PREFIX="${PWD}/${_PPS}" \
6364
-DCMAKE_C_FLAGS="${_CFLAGS_GLOBAL_CMAKE} ${_CFLAGS_GLOBAL} ${_CPPFLAGS_GLOBAL} ${CPPFLAGS} ${_LDFLAGS_GLOBAL} ${LDFLAGS} ${LIBS}" \
6465
-DCMAKE_CXX_FLAGS="${_CFLAGS_GLOBAL_CMAKE} ${_CFLAGS_GLOBAL} ${_CPPFLAGS_GLOBAL} ${CPPFLAGS} ${_LDFLAGS_GLOBAL} ${LDFLAGS} ${LIBS} ${_CXXFLAGS_GLOBAL} ${_LDFLAGS_CXX_GLOBAL}"
6566

6667
cmake --build "${_BLDDIR}"
67-
cmake --install "${_BLDDIR}" --prefix "${_PPS}"
68+
cmake --install "${_BLDDIR}"
6869

6970
# Delete .pc files
7071
rm -r -f "${_PPS}"/lib/pkgconfig

0 commit comments

Comments
 (0)