diff --git a/Makefile b/Makefile index 9ef42bda..1d785a24 100644 --- a/Makefile +++ b/Makefile @@ -29,6 +29,8 @@ MKDIR ?= mkdir MKTEMP ?= mktemp MV ?= mv RM ?= rm +RPMBUILD ?= rpmbuild +RPMBUILD_FLAGS ?= SED ?= sed STRIP ?= strip TAR ?= tar @@ -343,7 +345,7 @@ rpm: tarball $(SED) 's/__VERSION__/$(VERSION)/g' mergerfs.spec > \ rpmbuild/SOURCES/mergerfs.spec cp -ar mergerfs-$(VERSION).tar.gz rpmbuild/SOURCES - rpmbuild -ba rpmbuild/SOURCES/mergerfs.spec \ + $(RPMBUILD) $(RPMBUILD_FLAGS) -ba rpmbuild/SOURCES/mergerfs.spec \ --define "_topdir $(CURDIR)/rpmbuild" .PHONY: install-build-pkgs diff --git a/buildtools/build-mergerfs b/buildtools/build-mergerfs index efb9140f..baea10db 100755 --- a/buildtools/build-mergerfs +++ b/buildtools/build-mergerfs @@ -5,6 +5,15 @@ if [ -e /tmp/build-env ]; then . /tmp/build-env fi +rpmbuild_flags() +{ + case "$(command -v "${CXX:-g++}")" in + /opt/rh/*) + printf '%s' '--undefine _annotated_build' + ;; + esac +} + if [ $# -ne 2 ]; then echo "usage: $0 " echo "argv: $@" @@ -32,9 +41,9 @@ mkdir "/build" if [ -e /usr/bin/apt-get ]; then make deb elif [ -e /usr/bin/dnf ]; then - make rpm + make RPMBUILD_FLAGS="$(rpmbuild_flags)" rpm elif [ -e /usr/bin/yum ]; then - make rpm + make RPMBUILD_FLAGS="$(rpmbuild_flags)" rpm elif [ -e /sbin/apk ]; then echo "NOT YET SUPPORTED" exit 1