Fixes #15729: Add trace parameters to make calls during build

Normation · Sep 17, 2019 · 9d0212d · 9d0212d
1 parent a962281
commit 9d0212d
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 20 deletions.
diff --git a/rudder-agent/SPECS/rudder-agent.spec b/rudder-agent/SPECS/rudder-agent.spec
@@ -310,7 +310,10 @@ cd %{_sourcedir}
 cp /usr/lib64/libattr.a /usr/lib64/libattr.la /lib64 || cp /usr/lib/libattr.a /usr/lib/libattr.la /lib
 %endif
 
-make BUILD_CFLAGS="${RPM_OPT_FLAGS}" USE_SYSTEM_OPENSSL=%{use_system_openssl} BUILD_OLD_OPENSSL=%{build_old_openssl} USE_SYSTEM_LMDB=%{use_system_lmdb} USE_SYSTEM_PCRE=%{use_system_pcre} USE_SYSTEM_FUSION=%{use_system_fusion} USE_SYSTEM_PERL=%{use_system_perl} USE_HTTPS=%{use_https} USE_SYSTEM_ZLIB=%{use_system_zlib} USE_SYSTEM_CURL=%{use_system_curl} USE_SYSTEM_YAML=%{use_system_yaml} USE_SYSTEM_XML=%{use_system_xml} USE_PIE=%{use_pie} OS_FAMILY=%{os_family}
+%if "%{?_os}" != "aix"
+TRACE=--trace
+%endif
+make ${TRACE} BUILD_CFLAGS="${RPM_OPT_FLAGS}" USE_SYSTEM_OPENSSL=%{use_system_openssl} BUILD_OLD_OPENSSL=%{build_old_openssl} USE_SYSTEM_LMDB=%{use_system_lmdb} USE_SYSTEM_PCRE=%{use_system_pcre} USE_SYSTEM_FUSION=%{use_system_fusion} USE_SYSTEM_PERL=%{use_system_perl} USE_HTTPS=%{use_https} USE_SYSTEM_ZLIB=%{use_system_zlib} USE_SYSTEM_CURL=%{use_system_curl} USE_SYSTEM_YAML=%{use_system_yaml} USE_SYSTEM_XML=%{use_system_xml} USE_PIE=%{use_pie} OS_FAMILY=%{os_family}
 
 #=================================================
 # Installation
@@ -337,7 +340,10 @@ cd %{_sourcedir}
 %endif
 ####
 
-make install DESTDIR=%{buildroot} USE_SYSTEM_OPENSSL=%{use_system_openssl} BUILD_OLD_OPENSSL=%{build_old_openssl} USE_SYSTEM_LMDB=%{use_system_lmdb} USE_SYSTEM_PCRE=%{use_system_pcre} USE_SYSTEM_ZLIB=%{use_system_zlib} USE_SYSTEM_CURL=%{use_system_curl} USE_SYSTEMD=%{use_systemd} USE_SYSTEM_FUSION=%{use_system_fusion} USE_SYSTEM_PERL=%{use_system_perl} USE_HTTPS=%{use_https}  USE_SYSTEM_YAML=%{use_system_yaml} USE_SYSTEM_XML=%{use_system_xml} USE_PIE=%{use_pie} OS_FAMILY=%{os_family}
+%if "%{?_os}" != "aix"
+TRACE=--trace
+%endif
+make ${TRACE} install DESTDIR=%{buildroot} USE_SYSTEM_OPENSSL=%{use_system_openssl} BUILD_OLD_OPENSSL=%{build_old_openssl} USE_SYSTEM_LMDB=%{use_system_lmdb} USE_SYSTEM_PCRE=%{use_system_pcre} USE_SYSTEM_ZLIB=%{use_system_zlib} USE_SYSTEM_CURL=%{use_system_curl} USE_SYSTEMD=%{use_systemd} USE_SYSTEM_FUSION=%{use_system_fusion} USE_SYSTEM_PERL=%{use_system_perl} USE_HTTPS=%{use_https}  USE_SYSTEM_YAML=%{use_system_yaml} USE_SYSTEM_XML=%{use_system_xml} USE_PIE=%{use_pie} OS_FAMILY=%{os_family}
 
 # remove perl doc
 rm -rf %{buildroot}/opt/rudder/man %{buildroot}/opt/rudder/lib/perl5/5.22.0/pod

diff --git a/rudder-agent/debian/rules b/rudder-agent/debian/rules
@@ -90,7 +90,7 @@ DEPS := $(DEPS), libxml-treepp-perl
 endif
 
 
-MAKE_OPTIONS=USE_HTTPS=$(USE_HTTPS) USE_SYSTEM_OPENSSL=$(USE_SYSTEM_OPENSSL) BUILD_OLD_OPENSSL=$(BUILD_OLD_OPENSSL) USE_SYSTEM_FUSION=$(USE_SYSTEM_FUSION) USE_SYSTEM_PERL=$(USE_SYSTEM_PERL) USE_SYSTEMD=$(USE_SYSTEMD) USE_SYSTEM_CURL=$(USE_SYSTEM_CURL) USE_SYSTEM_YAML=$(USE_SYSTEM_YAML) USE_SYSTEM_XML=$(USE_SYSTEM_XML) USE_PIE=$(USE_PIE)
+MAKE_OPTIONS=--trace USE_HTTPS=$(USE_HTTPS) USE_SYSTEM_OPENSSL=$(USE_SYSTEM_OPENSSL) BUILD_OLD_OPENSSL=$(BUILD_OLD_OPENSSL) USE_SYSTEM_FUSION=$(USE_SYSTEM_FUSION) USE_SYSTEM_PERL=$(USE_SYSTEM_PERL) USE_SYSTEMD=$(USE_SYSTEMD) USE_SYSTEM_CURL=$(USE_SYSTEM_CURL) USE_SYSTEM_YAML=$(USE_SYSTEM_YAML) USE_SYSTEM_XML=$(USE_SYSTEM_XML) USE_PIE=$(USE_PIE)
 
 # manage dependencies
 ifeq (true,$(USE_SYSTEM_OPENSSL))

diff --git a/rudder-agent/slackware/rudder-agent.SlackBuild b/rudder-agent/slackware/rudder-agent.SlackBuild
@@ -69,7 +69,7 @@ mkdir -p $TMP $PKG
 
 # Compile the application and install it into the $PKG directory
 cd ../SOURCES
-env="USE_PAM=false DESTDIR=$PKG/ USE_SYSTEM_PERL=false USE_SYSTEM_OPENSSL=false"
+env="--trace USE_PAM=false DESTDIR=$PKG/ USE_SYSTEM_PERL=false USE_SYSTEM_OPENSSL=false"
 make $env
 make install $env
 cd $PKG

diff --git a/rudder-api-client/Makefile b/rudder-api-client/Makefile
@@ -1,4 +1,4 @@
 .DEFAULT_GOAL := build
 # Used on debian to redirect calls to final Makefile so dh auto commands work
 %:
-	make -C BUILD/rudder-api-client/ $@
+	make -C BUILD/rudder-api-client/ --trace $@
diff --git a/rudder-api-client/SPECS/rudder-api-client.spec b/rudder-api-client/SPECS/rudder-api-client.spec
@@ -78,7 +78,7 @@ find . -type f | xargs sed -i '1,1s|#!/usr/bin/python3|#!/usr/bin/python2|'
 %install
 cd rudder-sources-*/rudder-api-client/
 
-make install DESTDIR=%{buildroot}
+make --trace install DESTDIR=%{buildroot}
 
 #=================================================
 # Cleaning

diff --git a/rudder-reports/Makefile b/rudder-reports/Makefile
@@ -1,4 +1,4 @@
 .DEFAULT_GOAL := build
 # Used on debian to redirect calls to final Makefile so dh auto commands work
 %:
-	make -C SOURCES $@
+	make -C SOURCES --trace $@
diff --git a/rudder-reports/SPECS/rudder-reports.spec b/rudder-reports/SPECS/rudder-reports.spec
@@ -81,7 +81,7 @@ calculate compliance to given configuration rules.
 rm -rf %{buildroot}
 
 cd %{_sourcedir}
-make install DESTDIR=%{buildroot}
+make --trace install DESTDIR=%{buildroot}
 
 
 #=================================================

diff --git a/rudder-server-relay/Makefile b/rudder-server-relay/Makefile
@@ -1,4 +1,4 @@
 .DEFAULT_GOAL := build
 # Used on debian to redirect calls to final Makefile so dh auto commands work
 %:
-	make -C BUILD/rudder/relay/sources/ $@
+	make -C BUILD/rudder/relay/sources/ --trace $@
diff --git a/rudder-server-relay/SPECS/rudder-server-relay.spec b/rudder-server-relay/SPECS/rudder-server-relay.spec
@@ -129,9 +129,9 @@ sed -i "s%^DocumentRoot /var/www$%DocumentRoot /srv/www%" apache/rudder-apache-r
 %endif
 
 %if 0%{?rhel} == 7
-make build SELINUX=%{selinux} PYTHON=python2
+make --trace build SELINUX=%{selinux} PYTHON=python2
 %else
-make build SELINUX=%{selinux}
+make --trace build SELINUX=%{selinux}
 %endif
 
 #=================================================
@@ -143,7 +143,7 @@ cd rudder-sources-*/rudder/relay/sources/
 # TODO remove
 rm -rf %{buildroot}
 
-make install APACHE_VHOSTDIR=%{apache_vhost_dir} DESTDIR=%{buildroot} SELINUX=%{selinux}
+make --trace install APACHE_VHOSTDIR=%{apache_vhost_dir} DESTDIR=%{buildroot} SELINUX=%{selinux}
 
 mkdir -p %{buildroot}/etc/sysconfig/
 install -m 644 rudder-relay-apache %{buildroot}/etc/sysconfig/rudder-relay-apache

diff --git a/rudder-server-root/Makefile b/rudder-server-root/Makefile
@@ -1,4 +1,4 @@
 .DEFAULT_GOAL := build
 # Used on debian to redirect calls to final Makefile so dh auto commands work
 %:
-	make -C SOURCES $@
+	make -C SOURCES --trace $@
diff --git a/rudder-server-root/SPECS/rudder-server-root.spec b/rudder-server-root/SPECS/rudder-server-root.spec
@@ -74,7 +74,7 @@ run a Rudder root server on a machine.
 cd %{_sourcedir}
 
 cd %{_sourcedir}
-make install DESTDIR=%{buildroot}
+make --trace install DESTDIR=%{buildroot}
 
 #=================================================
 # pretrans is run before all preinst when installing more than one package

diff --git a/rudder-webapp/Makefile b/rudder-webapp/Makefile
@@ -1,4 +1,4 @@
 .DEFAULT_GOAL := build
 # Used on debian to redirect calls to final Makefile so dh auto commands work
 %:
-	make -C SOURCES $@
+	make -C SOURCES --trace $@
diff --git a/rudder-webapp/SPECS/rudder-webapp.spec b/rudder-webapp/SPECS/rudder-webapp.spec
@@ -139,7 +139,7 @@ Rudder.
 %prep
 
 cd %{_sourcedir}
-make rudder-sources
+make --trace rudder-sources
 
 # rhel7 and sles12 don't have mod wsgi python 3 so we force python2 instead
 %if 0%{?rhel} == 7 || ( 0%{?suse_version} && 0%{?suse_version} < 1500 )
@@ -156,9 +156,9 @@ export CFLAGS="$RPM_OPT_FLAGS"
 
 cd %{_sourcedir}
 %if 0%{?rhel} == 7 || ( 0%{?suse_version} && 0%{?suse_version} < 1500 )
-make build PYTHON=python2
+make --trace build PYTHON=python2
 %else
-make build
+make --trace build
 %endif
 
 %if 0%{?rhel}
@@ -177,9 +177,9 @@ rm -rf %{buildroot}
 cd %{_sourcedir}
 # python should not be needed at install time, but build is run twice, i don't know why
 %if 0%{?rhel} == 7 || ( 0%{?suse_version} && 0%{?suse_version} < 1500 )
-make install APACHE_VHOSTDIR=%{apache_vhost_dir} DESTDIR=%{buildroot} JETTY_SCRIPT=%{jetty_init_script} APACHE_CONFDIR=%{apache_vhost_dir} PYTHON=python2
+make --trace install APACHE_VHOSTDIR=%{apache_vhost_dir} DESTDIR=%{buildroot} JETTY_SCRIPT=%{jetty_init_script} APACHE_CONFDIR=%{apache_vhost_dir} PYTHON=python2
 %else
-make install APACHE_VHOSTDIR=%{apache_vhost_dir} DESTDIR=%{buildroot} JETTY_SCRIPT=%{jetty_init_script} APACHE_CONFDIR=%{apache_vhost_dir}
+make --trace install APACHE_VHOSTDIR=%{apache_vhost_dir} DESTDIR=%{buildroot} JETTY_SCRIPT=%{jetty_init_script} APACHE_CONFDIR=%{apache_vhost_dir}
 %endif
 
 %if 0%{?rhel}