From 0719b66eeb1cbb620c801698960dd3ed44b25bd1 Mon Sep 17 00:00:00 2001
From: Vsevolod Stakhov <vsevolod@rspamd.com>
Date: Tue, 15 Oct 2024 16:13:42 +0100
Subject: [PATCH] [Minor] Remove bogus DEBIAN_BUILD constant

---
 CMakeLists.txt              | 12 +++++-------
 debian/rules                |  2 +-
 rpm/rspamd.spec             |  2 +-
 src/CMakeLists.txt          |  4 ++--
 src/client/CMakeLists.txt   |  4 ++--
 src/rspamadm/CMakeLists.txt |  4 ++--
 6 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d384fa1b..6daced05a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -798,13 +798,11 @@ ADD_CUSTOM_TARGET(dist ${CMAKE_SOURCE_DIR}/dist.sh
         COMMENT "Create source distribution"
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
 
-IF (NOT DEBIAN_BUILD)
-    ADD_CUSTOM_TARGET(check DEPENDS rspamd-test-cxx rspamd-test)
-    ADD_CUSTOM_TARGET(run-test DEPENDS check
-            COMMAND test/rspamd-test-cxx
-            COMMAND sh -c 'LUA_PATH="${CMAKE_SOURCE_DIR}/lualib/?.lua\;${CMAKE_SOURCE_DIR}/lualib/?/?.lua\;${CMAKE_SOURCE_DIR}/lualib/?/init.lua\;${CMAKE_SOURCE_DIR}/contrib/lua-?/?.lua"
-            test/rspamd-test -p /rspamd/lua')
-ENDIF (NOT DEBIAN_BUILD)
+ADD_CUSTOM_TARGET(check DEPENDS rspamd-test-cxx rspamd-test)
+ADD_CUSTOM_TARGET(run-test DEPENDS check
+        COMMAND test/rspamd-test-cxx
+        COMMAND sh -c 'LUA_PATH="${CMAKE_SOURCE_DIR}/lualib/?.lua\;${CMAKE_SOURCE_DIR}/lualib/?/?.lua\;${CMAKE_SOURCE_DIR}/lualib/?/init.lua\;${CMAKE_SOURCE_DIR}/contrib/lua-?/?.lua"
+        test/rspamd-test -p /rspamd/lua')
 
 
 # PVS Studio
diff --git a/debian/rules b/debian/rules
index 74771ede3..be06aa6d6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,7 +39,7 @@ configure_%:
 		-DSYSTEMDDIR=/lib/systemd/system \
 		-DCMAKE_INSTALL_PREFIX:PATH=/usr \
 		-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
-		-DDEBIAN_BUILD=1 \
+		-DNO_TARGET_VERSIONS=1 \
 		-DENABLE_PCRE2=ON \
 		-DENABLE_LIBUNWIND=ON \
 		-DWANT_SYSTEMD_UNITS=ON \
diff --git a/rpm/rspamd.spec b/rpm/rspamd.spec
index 7a1a15c92..0727d2430 100644
--- a/rpm/rspamd.spec
+++ b/rpm/rspamd.spec
@@ -136,7 +136,7 @@ rm -f %{_builddir}/luajit-build/lib/*.so || true
         -DSYSTEMDDIR=%{_unitdir} \
         -DWANT_SYSTEMD_UNITS=ON \
         -DNO_SHARED=ON \
-        -DDEBIAN_BUILD=1 \
+        -DNO_TARGET_VERSIONS=1 \
 %ifarch x86_64 amd64 arm64 aarch64
         -DENABLE_HYPERSCAN=ON \
 %endif
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 173917703..f7fdcef7b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -235,9 +235,9 @@ ADD_EXECUTABLE(rspamd ${RSPAMDSRC} ${CMAKE_CURRENT_BINARY_DIR}/workers.c ${CMAKE
 ADD_BACKWARD(rspamd)
 SET_TARGET_PROPERTIES(rspamd PROPERTIES LINKER_LANGUAGE CXX)
 SET_TARGET_PROPERTIES(rspamd-server PROPERTIES LINKER_LANGUAGE CXX)
-IF(NOT DEBIAN_BUILD)
+IF(NOT NO_TARGET_VERSIONS)
 	SET_TARGET_PROPERTIES(rspamd PROPERTIES VERSION ${RSPAMD_VERSION})
-ENDIF(NOT DEBIAN_BUILD)
+ENDIF()
 
 #TARGET_LINK_LIBRARIES(rspamd ${RSPAMD_REQUIRED_LIBRARIES})
 TARGET_LINK_LIBRARIES(rspamd rspamd-server)
diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index edf3cc1c4..543fc629c 100644
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -9,8 +9,8 @@ SET_TARGET_PROPERTIES(rspamc PROPERTIES COMPILE_FLAGS "-I${CMAKE_SOURCE_DIR}/lib
 TARGET_LINK_LIBRARIES(rspamc rspamd-server)
 SET_TARGET_PROPERTIES(rspamc PROPERTIES LINKER_LANGUAGE CXX)
 
-IF(NOT DEBIAN_BUILD)
+IF(NOT NO_TARGET_VERSIONS)
 	SET_TARGET_PROPERTIES(rspamc PROPERTIES VERSION ${RSPAMD_VERSION})
-ENDIF(NOT DEBIAN_BUILD)
+ENDIF()
 
 INSTALL(TARGETS rspamc RUNTIME DESTINATION bin)
diff --git a/src/rspamadm/CMakeLists.txt b/src/rspamadm/CMakeLists.txt
index 5e88ec8dd..2f32a95f5 100644
--- a/src/rspamadm/CMakeLists.txt
+++ b/src/rspamadm/CMakeLists.txt
@@ -22,9 +22,9 @@ ENDIF()
 ADD_EXECUTABLE(rspamadm ${RSPAMADMSRC})
 TARGET_LINK_LIBRARIES(rspamadm rspamd-server)
 
-IF (NOT DEBIAN_BUILD)
+IF (NOT NO_TARGET_VERSIONS)
     SET_TARGET_PROPERTIES(rspamadm PROPERTIES VERSION ${RSPAMD_VERSION})
-ENDIF (NOT DEBIAN_BUILD)
+ENDIF ()
 
 SET_TARGET_PROPERTIES(rspamadm PROPERTIES LINKER_LANGUAGE CXX)
 ADD_BACKWARD(rspamadm)
-- 
2.39.5