[pkg-nagios-changes] [Git][nagios-team/pkg-icinga2][master] 2 commits: Remove the unity build disabling

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian Nagios Maintainer Group / pkg-icinga2


Commits:
a321e9eb by Adrian Bunk at 2020-12-20T19:19:28+02:00
Remove the unity build disabling

We do no longer have any limitations based on the build architecture,
and it does not seem to run into the address space limit.

- - - - -
d426f8fe by Adrian Bunk at 2021-02-11T23:04:19+02:00
Link with -latomic on architectures that need it

- - - - -


1 changed file:

- debian/rules


Changes:

=====================================
debian/rules
=====================================
@@ -9,9 +9,8 @@ include /usr/share/dpkg/architecture.mk
 
 export CTEST_OUTPUT_ON_FAILURE=1
 
-# disable unity builds for arches with low memory
-ifneq (,$(findstring $(DEB_BUILD_ARCH),"armhf mips mipsel"))
-	UNITY_BUILD = -DICINGA2_UNITY_BUILD=Off
+ifneq (,$(filter $(DEB_HOST_ARCH), armel mips mipsel powerpc))
+  export DEB_LDFLAGS_MAINT_APPEND += -Wl,--no-as-needed -latomic -Wl,--as-needed
 endif
 
 %:
@@ -37,8 +36,7 @@ override_dh_auto_configure:
 		-DICINGA2_COMMAND_GROUP=www-data \
 		-DICINGA2_GIT_VERSION_INFO=false \
 		-DICINGA2_PLUGINDIR=/usr/lib/nagios/plugins \
-		-DUSE_SYSTEMD=ON \
-		$(UNITY_BUILD)
+		-DUSE_SYSTEMD=ON
 
 override_dh_auto_install:
 	dh_auto_install



View it on GitLab: https://salsa.debian.org/nagios-team/pkg-icinga2/-/compare/abb283bfbf1f1715c562d29e95dcfef6758ce8dd...d426f8fe2440f87a8ce8b5bd22bd995b384e4fec

-- 
View it on GitLab: https://salsa.debian.org/nagios-team/pkg-icinga2/-/compare/abb283bfbf1f1715c562d29e95dcfef6758ce8dd...d426f8fe2440f87a8ce8b5bd22bd995b384e4fec
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-nagios-changes/attachments/20210212/7c07357e/attachment.html>