Parameterize the rocky9 libevent install patch by CMAKE_INSTALL_LIBDIR
Share the debian13 patch content, renamed to libevent-libdir-install.patch, so the install directory follows CMAKE_INSTALL_LIBDIR instead of a hardcoded lib64. On Rocky Linux GNUInstallDirs already defaults it to lib64, so the Dockerfile does not need to pass it. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
b21f7db67b
commit
195a389f8a
2 files changed
+25
-19
No files matched your search
+3
-3
@@ -78,11 +78,11 @@ RUN --mount=type=bind,from=sources,source=openssl-openssl-3.0.15.tar.gz,target=/
|
||||
&& cd .. \
|
||||
&& rm -rf src
|
||||
|
||||
COPY libevent-lib64-install.patch /tmp/
|
||||
COPY libevent-libdir-install.patch /tmp/
|
||||
RUN --mount=type=bind,from=sources,source=libevent-release-2.1.12-stable.tar.gz,target=/tmp/libevent.tar.gz \
|
||||
mkdir src \
|
||||
&& tar --extract --gzip --file=/tmp/libevent.tar.gz --directory=src --strip-components=1 \
|
||||
&& git -C src apply /tmp/libevent-lib64-install.patch \
|
||||
&& git -C src apply /tmp/libevent-libdir-install.patch \
|
||||
&& cmake -G Ninja -S src -B build -DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
|
||||
-DEVENT__DISABLE_BENCHMARK=ON \
|
||||
@@ -91,7 +91,7 @@ RUN --mount=type=bind,from=sources,source=libevent-release-2.1.12-stable.tar.gz,
|
||||
-DEVENT__DISABLE_TESTS=ON \
|
||||
-DEVENT__LIBRARY_TYPE=STATIC \
|
||||
&& cmake --build build --parallel "$(nproc)" --target install \
|
||||
&& rm -rf build src /tmp/libevent-lib64-install.patch
|
||||
&& rm -rf build src /tmp/libevent-libdir-install.patch
|
||||
|
||||
RUN --mount=type=bind,from=sources,source=zstd-v1.5.7.tar.gz,target=/tmp/zstd.tar.gz \
|
||||
mkdir src \
|
||||
|
||||
Reference in new issue
Block a user