From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 24 Mar 2023 16:56:32 +0000 (+0000)
Subject: macros: Move cmake/meson/ninja/perl stuff into the build namespace
X-Git-Tag: 0.9.29~212
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1f36d17f277805dc832581b8e5ecaf850bc2047a;p=pakfire.git

macros: Move cmake/meson/ninja/perl stuff into the build namespace

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/macros/cmake.macro b/macros/cmake.macro
index ed6ec354f..06c782d21 100644
--- a/macros/cmake.macro
+++ b/macros/cmake.macro
@@ -1,25 +1,26 @@
 #
 # cmake macros
 #
+build
+	__cmake = /usr/bin/cmake
+	if "%{lib}" == "lib64"
+		__cmake_lib_suffix = -DLIB_SUFFIX=64
+	end
 
-__cmake = /usr/bin/cmake
-if "%{lib}" == "lib64"
-	__cmake_lib_suffix = -DLIB_SUFFIX=64
+	cmake = %{__cmake} \
+		-DCMAKE_VERBOSE_MAKEFILE=ON \
+		\
+		-DCMAKE_INSTALL_PREFIX:PATH=%{prefix} \
+		-DCMAKE_INSTALL_SYSCONFDIR:PATH=%{sysconfdir} \
+		-DCMAKE_INSTALL_LIBDIR:PATH=%{libdir} \
+		-DCMAKE_INSTALL_INCLUDEDIR:PATH=%{includedir} \
+		-DCMAKE_INSTALL_DATAROOTDIR:PATH=%{datadir} \
+		%{__cmake_lib_suffix} \
+		-DBUILD_SHARED_LIBS:BOOL=ON \
+		-DBUILD_STATIC_LIBS:BOOL=OFF \
+		\
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
+		-DCMAKE_C_FLAGS_RELWITHDEBINFO="%{CFLAGS}" \
+		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="%{CXXFLAGS}" \
+		-DCMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO="%{LDFLAGS}"
 end
-
-cmake = %{__cmake} \
-	-DCMAKE_VERBOSE_MAKEFILE=ON \
-	\
-	-DCMAKE_INSTALL_PREFIX:PATH=%{prefix} \
-	-DCMAKE_INSTALL_SYSCONFDIR:PATH=%{sysconfdir} \
-	-DCMAKE_INSTALL_LIBDIR:PATH=%{libdir} \
-	-DCMAKE_INSTALL_INCLUDEDIR:PATH=%{includedir} \
-	-DCMAKE_INSTALL_DATAROOTDIR:PATH=%{datadir} \
-	%{__cmake_lib_suffix} \
-	-DBUILD_SHARED_LIBS:BOOL=ON \
-	-DBUILD_STATIC_LIBS:BOOL=OFF \
-	\
-	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-	-DCMAKE_C_FLAGS_RELWITHDEBINFO="%{CFLAGS}" \
-	-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="%{CXXFLAGS}" \
-	-DCMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO="%{LDFLAGS}"
diff --git a/macros/meson.macro b/macros/meson.macro
index 07ffad220..28c370fc4 100644
--- a/macros/meson.macro
+++ b/macros/meson.macro
@@ -2,39 +2,39 @@
 # Meson macros
 #
 
-__meson = %{bindir}/meson
-__meson_wrap_mode = nodownload
-__meson_auto_features = enabled
+build
+	__meson = %{bindir}/meson
+	__meson_wrap_mode = nodownload
+	__meson_auto_features = enabled
 
-_smp_mesonflags = %{PARALLELISMFLAGS}
+	_smp_mesonflags = %{PARALLELISMFLAGS}
 
-meson = \
-    %{__meson} \
-	--buildtype=plain \
-	--prefix=%{prefix} \
-	--libdir=%{libdir} \
-	--libexecdir=%{libexecdir} \
-	--bindir=%{bindir} \
-	--sbindir=%{sbindir} \
-	--includedir=%{includedir} \
-	--datadir=%{datadir} \
-	--mandir=%{mandir} \
-	--infodir=%{infodir} \
-	--localedir=%{datadir}/locale \
-	--sysconfdir=%{sysconfdir} \
-	--localstatedir=%{localstatedir} \
-	--sharedstatedir=%{sharedstatedir} \
-	--wrap-mode=%{__meson_wrap_mode} \
-	--auto-features=%{__meson_auto_features} \
-        . %{DISTRO_MACHINE}
+	meson = %{__meson} \
+		--buildtype=plain \
+		--prefix=%{prefix} \
+		--libdir=%{libdir} \
+		--libexecdir=%{libexecdir} \
+		--bindir=%{bindir} \
+		--sbindir=%{sbindir} \
+		--includedir=%{includedir} \
+		--datadir=%{datadir} \
+		--mandir=%{mandir} \
+		--infodir=%{infodir} \
+		--localedir=%{datadir}/locale \
+		--sysconfdir=%{sysconfdir} \
+		--localstatedir=%{localstatedir} \
+		--sharedstatedir=%{sharedstatedir} \
+		--wrap-mode=%{__meson_wrap_mode} \
+		--auto-features=%{__meson_auto_features} \
+	        . %{DISTRO_MACHINE}
 
-meson_build = \
-	%{ninja_build} -C %{DISTRO_MACHINE}
+	meson_build = \
+		%{ninja_build} -C %{DISTRO_MACHINE}
 
-meson_install = \
-	%{ninja_install} -C %{DISTRO_MACHINE}
+	meson_install = \
+		%{ninja_install} -C %{DISTRO_MACHINE}
 
-meson_test = \
-    %{__meson} test \
-	-C %{DISTRO_MACHINE} \
-	--print-errorlogs
+	meson_test = %{__meson} test \
+		-C %{DISTRO_MACHINE} \
+		--print-errorlogs
+end
diff --git a/macros/ninja.macro b/macros/ninja.macro
index 9c41b7ca2..c203d0f9e 100644
--- a/macros/ninja.macro
+++ b/macros/ninja.macro
@@ -2,19 +2,20 @@
 # ninja-build macros
 #
 
-__ninja = %{bindir}/ninja
-__ninja_common_opts = -v %{PARALLELISMFLAGS}
+build
+	__ninja = %{bindir}/ninja
+	__ninja_common_opts = -v %{PARALLELISMFLAGS}
 
-ninja_build = \
-	%{__ninja} \
-	%{__ninja_common_opts}
+	ninja_build = \
+		%{__ninja} \
+		%{__ninja_common_opts}
 
-ninja_install = \
-	DESTDIR=%{BUILDROOT} \
-	%{__ninja} install \
-	%{__ninja_common_opts}
-
-ninja_test = \
-	%{__ninja} test \
-	%{__ninja_common_opts}
+	ninja_install = \
+		DESTDIR=%{BUILDROOT} \
+		%{__ninja} install \
+		%{__ninja_common_opts}
 
+	ninja_test = \
+		%{__ninja} test \
+		%{__ninja_common_opts}
+end
diff --git a/macros/perl.macro b/macros/perl.macro
index aa8fa811e..61fe598d7 100644
--- a/macros/perl.macro
+++ b/macros/perl.macro
@@ -11,19 +11,21 @@ perl_version    = %(eval "$(%{perl} -V:version)";           echo ${version})
 
 perl_all_paths  = {%{perl_vendorarch},%{perl_vendorlib},%{perl_archlib},%{perl_privlib}}
 
-# perl_cleanup: Removes unwanted perl files.
-perl_cleanup
-	# Remove perllocal.pod.
-	rm -f %{BUILDROOT}%{perl_all_paths}/perllocal.pod
+build
+	# perl_cleanup: Removes unwanted perl files
+	perl_cleanup
+		# Remove perllocal.pod
+		rm -f %{BUILDROOT}%{perl_all_paths}/perllocal.pod
 
-	# Remove all .packlist files.
-	find %{BUILDROOT}%{perl_all_paths} -name ".packlist" 2>/dev/null | \
-		xargs --no-run-if-empty rm -f
+		# Remove all .packlist files
+		find %{BUILDROOT}%{perl_all_paths} -name ".packlist" 2>/dev/null | \
+			xargs --no-run-if-empty rm -f
 
-	# Remove all empty .bs files.
-	find %{BUILDROOT}%{perl_all_paths} -name ".bs" -type f -empty 2>/dev/null | \
-		xargs --no-run-if-empty rm -f
+		# Remove all empty .bs files
+		find %{BUILDROOT}%{perl_all_paths} -name ".bs" -type f -empty 2>/dev/null | \
+			xargs --no-run-if-empty rm -f
 
-	# Run user-defined stuff.
-	%{perl_cleanup_cmds}
+		# Run user-defined stuff
+		%{perl_cleanup_cmds}
+	end
 end