Skip to content

Commit

Permalink
Fixed issue reported by github workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
ernst-bablick committed Dec 24, 2024
1 parent cb8c144 commit 49afc16
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions cmake/ArchitectureSpecificSettings.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ function(architecture_specific_settings)
if (SGE_ARCH MATCHES "lx-riscv64")
# Linux RiscV
message(STATUS "We are on Linux: ${SGE_ARCH}")
# -Wno-deprecated-declarations
set(CMAKE_C_FLAGS "-Wall -Werror -pedantic" CACHE STRING "" FORCE)
set(CMAKE_CXX_FLAGS "-Wall -Werror -pedantic" CACHE STRING "" FORCE)

Expand Down Expand Up @@ -115,12 +114,13 @@ function(architecture_specific_settings)
# specific linux architectures
if (SGE_TARGETBITS STREQUAL "TARGET_32BIT")
add_compile_definitions(_FILE_OFFSET_BITS=64)
# readdir64_r seems to be deprecated
# readdir64_r seems to be deprecated CS-199
add_compile_options(-Wno-deprecated-declarations)
elseif ((OS_ID STREQUAL "raspbian" AND OS_VERSION EQUAL 10)
OR (OS_ID STREQUAL "tuxedo" AND OS_VERSION EQUAL 22.04)
OR (OS_ID STREQUAL "ubuntu" AND OS_VERSION EQUAL 22.04)
OR (OS_ID STREQUAL "rocky" AND OS_VERSION EQUAL 9.4))
# readdir64_r seems to be deprecated CS-199
add_compile_options(-Wno-deprecated-declarations)
endif ()

Expand Down
4 changes: 2 additions & 2 deletions source/libs/sgeobj/ocs_Version.cc
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ const std::vector<std::tuple<uint32_t, std::string>> ocs::Version::OCS_ALL_VERSI
const std::string ocs::Version::OCS_LONG_PRODUCT_NAME = "Gridware Cluster Scheduler";
const std::string ocs::Version::OCS_SHORT_PRODUCT_NAME = "GCS";
#else
const std::string ocs::Version::GE_LONGNAME = "Open Cluster Scheduler";
const std::string ocs::Version::GE_SHORTNAME = "OCS";
const std::string ocs::Version::OCS_LONG_PRODUCT_NAME = "Open Cluster Scheduler";
const std::string ocs::Version::OCS_SHORT_PRODUCT_NAME = "OCS";
#endif

std::string
Expand Down
2 changes: 1 addition & 1 deletion source/libs/spool/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ set(LIBRARY_NAME spool)
set(LIBRARY_SOURCES sge_dirent.cc sge_spooling.cc sge_spooling_utilities.cc)
set(LIBRARY_INCLUDES "./")

# OGE-199 makes use of readdir_r/readdir64_r which is deprecated for Linux only
# CS-199 makes use of readdir_r/readdir64_r which is deprecated for Linux only
set_source_files_properties(sge_dirent.cc PROPERTIES COMPILE_FLAGS -Wno-deprecated-declarations)

add_library(${LIBRARY_NAME} STATIC ${LIBRARY_SOURCES})
Expand Down
2 changes: 1 addition & 1 deletion source/libs/uti/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ set(LIBRARY_SOURCES
sge_unistd.cc)
set(LIBRARY_INCLUDES "./" ${SGE_INCLUDES})

# OGE-199 makes use of readdir_r/readdir64_r which is deprecated for Linux only
# CS-199 makes use of readdir_r/readdir64_r which is deprecated for Linux only
set_source_files_properties(sge_unistd.cc PROPERTIES COMPILE_FLAGS -Wno-deprecated-declarations)

add_library(${LIBRARY_NAME} STATIC ${LIBRARY_SOURCES})
Expand Down

0 comments on commit 49afc16

Please sign in to comment.