Skip to content

Commit f4f9276

Browse files
committedMar 11, 2025·
Random cmake and docker file cleanup
1 parent 9f5dcab commit f4f9276

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed
 

‎CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ find_path (
172172
find_library ( DEBUGINFOD_LIB NAMES debuginfod )
173173

174174
if(DEBUGINFOD_INCLUDE_DIR AND DEBUGINFOD_LIB)
175-
message("found debuginfod header at ${DEBUGINFOD_INCLUDE_DIR}, lib at ${DEBUGINFOD_LIB}")
175+
message(STATUS "found debuginfod header at ${DEBUGINFOD_INCLUDE_DIR}, lib at ${DEBUGINFOD_LIB}")
176176
target_link_libraries(dwelf ${DEBUGINFOD_LIB})
177177
add_definitions(-DDEBUGINFOD)
178178
else()

‎docker/alma9-with-py3/Dockerfile

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
11
FROM almalinux:9
2-
RUN dnf install --enablerepo "baseos-debuginfo" -y epel-release cmake zlib-devel xz-devel python3-devel python3-debuginfo gcc g++
2+
RUN dnf install --enablerepo "baseos-debuginfo" -y epel-release
3+
RUN dnf install --enablerepo "baseos-debuginfo" -y gcc
4+
RUN dnf install --enablerepo "baseos-debuginfo" -y g++
5+
RUN dnf install --enablerepo "baseos-debuginfo" -y cmake
6+
RUN dnf install --enablerepo "baseos-debuginfo" -y zlib-devel
7+
RUN dnf install --enablerepo "baseos-debuginfo" -y xz-devel
8+
RUN dnf install --enablerepo "baseos-debuginfo" -y python3-devel
9+
RUN dnf install --enablerepo "baseos-debuginfo" -y python3-debuginfo
10+
RUN dnf install --enablerepo "baseos-debuginfo" -y elfutils-debuginfod-client-devel
311
WORKDIR /src/docker/alma9-with-py3
412
CMD ls -lsa /usr/bin/cmake && mkdir -p release && cd release && cmake -DPYTHON3=ON -DPYTHON3_SOURCE="/usr/include/python3.9" -DCMAKE_BUILD_TYPE=Release ../../.. && make -j && cd .. && mkdir -p debug && cd debug && cmake -DPYTHON3=ON -DPYTHON3_SOURCE="/usr/include/python3.9" -DCMAKE_BUILD_TYPE=Debug ../../.. && make -j && make test

‎tests/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.7)
1+
cmake_minimum_required(VERSION 3.10)
22
project(pstack-tests C CXX)
33

44
# Force debug build for tests. Many of the tests are looking at debug info that

0 commit comments

Comments
 (0)
Please sign in to comment.