From 25d193807910cb23e7a89c60eb00f072af74d9bc Mon Sep 17 00:00:00 2001 From: "Alexander A. Prokhorov" Date: Wed, 20 Mar 2024 15:46:34 +0000 Subject: [PATCH] Removed "-Wall" to make it somehow build on Ubuntu 22.04. --- build/cmake/CondorConfigure.cmake | 10 +++++----- .../bundles/krb5/1.4.3-p1/makefile1.freebsd.patch | 12 ++++++------ .../bundles/krb5/1.4.3-p1/src.appl.telnet.configure | 2 +- .../vendor/glite-build-common-cpp/m4/optimize.m4 | 12 ++++++------ src/condor_dagman/condor_sdk.Makefile | 10 +++++----- src/gpu/Makefile.gpu | 4 ++-- src/openstack_gahp/rapidjson.src/CMakeLists.txt | 4 ++-- .../rapidjson.src/example/CMakeLists.txt | 6 +++--- .../rapidjson.src/test/unittest/CMakeLists.txt | 4 ++-- src/safefile/configure | 8 ++++---- 10 files changed, 36 insertions(+), 36 deletions(-) diff --git a/build/cmake/CondorConfigure.cmake b/build/cmake/CondorConfigure.cmake index fd6e7f4169e..6bdf68e5490 100644 --- a/build/cmake/CondorConfigure.cmake +++ b/build/cmake/CondorConfigure.cmake @@ -329,7 +329,7 @@ message(STATUS "PYTHON_LIB = ${PYTHON_LIB}") endif() if( NOT "${PYTHON3_INSTALL_DIR}" MATCHES "registry") - execute_process(COMMAND "${PYTHON3_INSTALL_DIR}\\python.exe" "-c" "${PYTHON_QUERY_COMMAND}" + execute_process(COMMAND "${PYTHON3_INSTALL_DIR}\\python.exe" "-c" "${PYTHON_QUERY_COMMAND}" RESULT_VARIABLE _PYTHON_SUCCESS OUTPUT_VARIABLE _PYTHON_VALUES ERROR_VARIABLE _PYTHON_ERROR_VALUE @@ -706,7 +706,7 @@ endif() if (WITH_ADDRESS_SANITIZER) # Condor daemons dup stderr to /dev/null, so to see output need to run with - # ASAN_OPTIONS="log_path=/tmp/asan" condor_master + # ASAN_OPTIONS="log_path=/tmp/asan" condor_master set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-omit-frame-pointer") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -fno-omit-frame-pointer") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -fno-omit-frame-pointer") @@ -715,7 +715,7 @@ endif() if (WITH_UB_SANITIZER) # Condor daemons dup stderr to /dev/null, so to see output need to run with - # UBSAN_OPTIONS="log_path=/tmp/asan print_stacktrace=true" condor_master + # UBSAN_OPTIONS="log_path=/tmp/asan print_stacktrace=true" condor_master set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=undefined -fno-omit-frame-pointer") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=undefined -fno-omit-frame-pointer") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_C_FLAGS} -fsanitize=undefined -fno-omit-frame-pointer") @@ -1113,9 +1113,9 @@ if(MSVC) set(CONDOR_WIN_LIBS "crypt32.lib;mpr.lib;psapi.lib;mswsock.lib;netapi32.lib;imagehlp.lib;ws2_32.lib;powrprof.lib;iphlpapi.lib;userenv.lib;Pdh.lib") else(MSVC) - check_c_compiler_flag(-Wall c_Wall) + check_c_compiler_flag( c_Wall) if (c_Wall) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ") endif(c_Wall) # GGT tested compiling condor_history with -flto, it ran less than one tenth of one percent faster diff --git a/externals/bundles/krb5/1.4.3-p1/makefile1.freebsd.patch b/externals/bundles/krb5/1.4.3-p1/makefile1.freebsd.patch index 7e748c89700..b9d941b99d0 100755 --- a/externals/bundles/krb5/1.4.3-p1/makefile1.freebsd.patch +++ b/externals/bundles/krb5/1.4.3-p1/makefile1.freebsd.patch @@ -3,9 +3,9 @@ @@ -155,7 +155,7 @@ ALL_CFLAGS = $(DEFS) $(DEFINES) $(KRB_INCLUDES) $(LOCALINCLUDES) \ $(CPPFLAGS) $(CFLAGS) $(PTHREAD_CFLAGS) - --CFLAGS = -g -O2 -Wall -Wmissing-prototypes -Wcast-qual -Wcast-align -Wconversion -Wshadow -pedantic -+CFLAGS = -g -O2 -Wall -Wmissing-prototypes -Wcast-qual -Wcast-align -Wconversion -Wshadow -pedantic -DEAI_NODATA=EAI_NONAME - PTHREAD_CFLAGS = - CPPFLAGS = - DEFS = -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DKRB5_KRB4_COMPAT=1 -DHAVE_BT_RSEQ=1 -DKRB5_PRIVATE=1 -DKRB5_DEPRECATED=1 -DKRB5_DNS_LOOKUP_KDC=1 -DKRB5_DNS_LOOKUP=1 -DHAVE_NS_INITPARSE=1 -DHAVE_NS_NAME_UNCOMPRESS=1 -DHAVE_DN_SKIPNAME=1 -DHAVE_RES_SEARCH=1 -DHAVE_PRAGMA_WEAK_REF=1 -DDELAY_INITIALIZER=1 -DCONSTRUCTOR_ATTR_WORKS=1 -DDESTRUCTOR_ATTR_WORKS=1 -DHAVE_PTHREAD_ONCE=1 -DHAVE_PTHREAD_RWLOCK_INIT=1 -DHAVE_PTHREAD_RWLOCK_INIT_IN_THREAD_LIB=1 -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_REGCOMP=1 -DHAVE_REGEXEC=1 -DPOSIX_SIGTYPE=1 -Dkrb5_sigtype=void -DPOSIX_SIGNALS=1 -DHAVE_SA_LEN=1 -DGETPEERNAME_ARG2_TYPE=GETSOCKNAME_ARG2_TYPE -DGETPEERNAME_ARG3_TYPE=GETSOCKNAME_ARG3_TYPE -DGETSOCKNAME_ARG2_TYPE=struct\ sockaddr -DGETSOCKNAME_ARG3_TYPE=size_t + +-CFLAGS = -g -O2 -Wmissing-prototypes -Wcast-qual -Wcast-align -Wconversion -Wshadow -pedantic ++CFLAGS = -g -O2 -Wmissing-prototypes -Wcast-qual -Wcast-align -Wconversion -Wshadow -pedantic -DEAI_NODATA=EAI_NONAME + PTHREAD_CFLAGS = + CPPFLAGS = + DEFS = -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DKRB5_KRB4_COMPAT=1 -DHAVE_BT_RSEQ=1 -DKRB5_PRIVATE=1 -DKRB5_DEPRECATED=1 -DKRB5_DNS_LOOKUP_KDC=1 -DKRB5_DNS_LOOKUP=1 -DHAVE_NS_INITPARSE=1 -DHAVE_NS_NAME_UNCOMPRESS=1 -DHAVE_DN_SKIPNAME=1 -DHAVE_RES_SEARCH=1 -DHAVE_PRAGMA_WEAK_REF=1 -DDELAY_INITIALIZER=1 -DCONSTRUCTOR_ATTR_WORKS=1 -DDESTRUCTOR_ATTR_WORKS=1 -DHAVE_PTHREAD_ONCE=1 -DHAVE_PTHREAD_RWLOCK_INIT=1 -DHAVE_PTHREAD_RWLOCK_INIT_IN_THREAD_LIB=1 -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_REGCOMP=1 -DHAVE_REGEXEC=1 -DPOSIX_SIGTYPE=1 -Dkrb5_sigtype=void -DPOSIX_SIGNALS=1 -DHAVE_SA_LEN=1 -DGETPEERNAME_ARG2_TYPE=GETSOCKNAME_ARG2_TYPE -DGETPEERNAME_ARG3_TYPE=GETSOCKNAME_ARG3_TYPE -DGETSOCKNAME_ARG2_TYPE=struct\ sockaddr -DGETSOCKNAME_ARG3_TYPE=size_t diff --git a/externals/bundles/krb5/1.4.3-p1/src.appl.telnet.configure b/externals/bundles/krb5/1.4.3-p1/src.appl.telnet.configure index 52491aa7bb2..9fce7e25b26 100755 --- a/externals/bundles/krb5/1.4.3-p1/src.appl.telnet.configure +++ b/externals/bundles/krb5/1.4.3-p1/src.appl.telnet.configure @@ -2658,7 +2658,7 @@ echo "${ECHO_T}$krb5_cv_prog_gnu_ld" >&6 # maybe add -Waggregate-return, or can we assume that actually works by now? # -Wno-comment used to be used for SunOS system header # -Wno-long-long, if needed, for k5-platform.h without inttypes.h etc. -extra_gcc_warn_opts="-Wall -Wmissing-prototypes -Wcast-qual \ +extra_gcc_warn_opts=" -Wmissing-prototypes -Wcast-qual \ -Wcast-align -Wconversion -Wshadow" if test "$GCC" = yes ; then if test "x$krb5_ac_cflags_set" = xset ; then diff --git a/src/blahp/vendor/glite-build-common-cpp/m4/optimize.m4 b/src/blahp/vendor/glite-build-common-cpp/m4/optimize.m4 index 2bbfa877cc5..fa4705d6e23 100644 --- a/src/blahp/vendor/glite-build-common-cpp/m4/optimize.m4 +++ b/src/blahp/vendor/glite-build-common-cpp/m4/optimize.m4 @@ -24,19 +24,19 @@ AC_DEFUN([AC_OPTIMIZE], fi], optimizopt=$enableval ) - + if test "x$optimizopt" = "xyes" ; then AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) fi - + if test "x$optimizopt" = "xyes" ; then - CXXFLAGS="-g -Wall $optimise" - CFLAGS="-g -Wall $optimise" + CXXFLAGS="-g $optimise" + CFLAGS="-g $optimise" else - CXXFLAGS="-g -Wall $optimise" - CFLAGS="-g -Wall $optimise" + CXXFLAGS="-g $optimise" + CFLAGS="-g $optimise" fi AC_SUBST(CXXFLAGS) diff --git a/src/condor_dagman/condor_sdk.Makefile b/src/condor_dagman/condor_sdk.Makefile index e9703fc6c78..f9481a2ce9a 100644 --- a/src/condor_dagman/condor_sdk.Makefile +++ b/src/condor_dagman/condor_sdk.Makefile @@ -2,13 +2,13 @@ ## ## Copyright (C) 1990-2007, Condor Team, Computer Sciences Department, ## University of Wisconsin-Madison, WI. -## +## ## Licensed under the Apache License, Version 2.0 (the "License"); you ## may not use this file except in compliance with the License. You may ## obtain a copy of the License at -## +## ## http://www.apache.org/licenses/LICENSE-2.0 -## +## ## Unless required by applicable law or agreed to in writing, software ## distributed under the License is distributed on an "AS IS" BASIS, ## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -81,8 +81,8 @@ DEMANGLE = 2>&1 | c++filt all: condor_dagman -C_PLUS_FLAGS = $(STD_C_PLUS_FLAGS) -Wall -CFLAGS = $(STD_C_FLAGS) -Wall +C_PLUS_FLAGS = $(STD_C_PLUS_FLAGS) +CFLAGS = $(STD_C_FLAGS) LIB = -L../../lib -lcondorsdk OBJ = dagman_main.o submit.o dag.o job.o util.o parse.o debug.o types.o script.o scriptQ.o dagman_instantiate.o diff --git a/src/gpu/Makefile.gpu b/src/gpu/Makefile.gpu index 83ea8476087..5ae6636c1ed 100644 --- a/src/gpu/Makefile.gpu +++ b/src/gpu/Makefile.gpu @@ -16,10 +16,10 @@ condor_gpu_utilization.o : condor_gpu_utilization.cpp $(HEADERS) gpu_function_pointers.o : gpu_function_pointers.cpp $(HEADERS) condor_gpu_utilization : $(OBJECTS) - g++ -Wall -g -std=c++11 -o $@ -ldl $+ + g++ -g -std=c++11 -o $@ -ldl $+ %.o : %.cpp - g++ -Wall -g -std=c++11 -I../condor_tools -c $< -o $@ + g++ -g -std=c++11 -I../condor_tools -c $< -o $@ clean : rm -f $(TARGETS) $(OBJECTS) diff --git a/src/openstack_gahp/rapidjson.src/CMakeLists.txt b/src/openstack_gahp/rapidjson.src/CMakeLists.txt index 4b3ec23e25a..5eeebff4b87 100644 --- a/src/openstack_gahp/rapidjson.src/CMakeLists.txt +++ b/src/openstack_gahp/rapidjson.src/CMakeLists.txt @@ -26,9 +26,9 @@ if(RAPIDJSON_HAS_STDSTRING) endif() if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra -Werror") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wextra -Werror") elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra -Werror -Wno-missing-field-initializers") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wextra -Werror -Wno-missing-field-initializers") elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") add_definitions(-D_CRT_SECURE_NO_WARNINGS=1) endif() diff --git a/src/openstack_gahp/rapidjson.src/example/CMakeLists.txt b/src/openstack_gahp/rapidjson.src/example/CMakeLists.txt index 8063d892a72..959c8211736 100644 --- a/src/openstack_gahp/rapidjson.src/example/CMakeLists.txt +++ b/src/openstack_gahp/rapidjson.src/example/CMakeLists.txt @@ -14,13 +14,13 @@ set(EXAMPLES simplereader simplewriter tutorial) - + include_directories("../include/") if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall -Wextra -Weffc++ -Wswitch-default") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wextra -Weffc++ -Wswitch-default") elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall -Wextra -Weffc++ -Wswitch-default") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wextra -Weffc++ -Wswitch-default") elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") add_definitions(-D_CRT_SECURE_NO_WARNINGS=1) endif() diff --git a/src/openstack_gahp/rapidjson.src/test/unittest/CMakeLists.txt b/src/openstack_gahp/rapidjson.src/test/unittest/CMakeLists.txt index fd2eb4d1f9c..c76a3ac28d9 100644 --- a/src/openstack_gahp/rapidjson.src/test/unittest/CMakeLists.txt +++ b/src/openstack_gahp/rapidjson.src/test/unittest/CMakeLists.txt @@ -19,9 +19,9 @@ set(UNITTEST_SOURCES writertest.cpp) if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall -Wextra -Weffc++ -Wswitch-default -Wfloat-equal") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wextra -Weffc++ -Wswitch-default -Wfloat-equal") elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall -Wextra -Weffc++ -Wswitch-default -Wfloat-equal -Wimplicit-fallthrough") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wextra -Weffc++ -Wswitch-default -Wfloat-equal -Wimplicit-fallthrough") elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") add_definitions(-D_CRT_SECURE_NO_WARNINGS=1) endif() diff --git a/src/safefile/configure b/src/safefile/configure index 17c8ac38597..3168771964c 100755 --- a/src/safefile/configure +++ b/src/safefile/configure @@ -5587,8 +5587,8 @@ case ".$ac_cv_cflags_gcc_option__Werror" in ;; esac -echo "$as_me:$LINENO: checking CFLAGS for gcc -Wall" >&5 -echo $ECHO_N "checking CFLAGS for gcc -Wall... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking CFLAGS for gcc " >&5 +echo $ECHO_N "checking CFLAGS for gcc ... $ECHO_C" >&6 if test "${ac_cv_cflags_gcc_option__Wall+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5602,7 +5602,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_save_CFLAGS="$CFLAGS" -for ac_arg in "-pedantic -Werror % -Wall" "-pedantic % -Wall %% no, obsolete" # +for ac_arg in "-pedantic -Werror % " "-pedantic % %% no, obsolete" # do CFLAGS="$ac_save_CFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -7335,7 +7335,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_save_CFLAGS="$CFLAGS" -for ac_arg in "-check % " "-pedantic % -Wall" "-xstrconst % -v" "-std1 % -verbose -w0 -warnprotos" "-qlanglvl=ansi % -qsrcmsg -qinfo=all:noppt:noppc:noobs:nocnd" "-ansi -ansiE % -fullwarn" "+ESlit % +w1" "-Xc % -pvctl,fullmsg" "-h conform % -h msglevel 2" # +for ac_arg in "-check % " "-pedantic % " "-xstrconst % -v" "-std1 % -verbose -w0 -warnprotos" "-qlanglvl=ansi % -qsrcmsg -qinfo=all:noppt:noppc:noobs:nocnd" "-ansi -ansiE % -fullwarn" "+ESlit % +w1" "-Xc % -pvctl,fullmsg" "-h conform % -h msglevel 2" # do CFLAGS="$ac_save_CFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */