From d5ced8c46a7b1955b9265e16e719256d051455d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Thu, 4 Apr 2019 05:14:06 +0200 Subject: [PATCH] rpm: use rpm-build provided CFLAGS for pacat-simple-vchan (cherry picked from commit 742876e3eeac13d9bf94c1c08bc55ef7f82478e0) --- pulse/Makefile | 4 ++-- rpm_spec/gui-dom0.spec.in | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pulse/Makefile b/pulse/Makefile index 340e8b30..13da2851 100644 --- a/pulse/Makefile +++ b/pulse/Makefile @@ -1,5 +1,5 @@ -CC=gcc -CFLAGS=-Wall -Wextra -Werror -g -O2 +CC ?= gcc +CFLAGS += -Wall -Wextra -Werror -g -O2 VCHANLIBS=`pkg-config --libs vchan-$(BACKEND_VMM)` VCHANCFLAGS=`pkg-config --cflags vchan-$(BACKEND_VMM)` GLIBCFLAGS=`pkg-config --cflags glib-2.0` `pkg-config --cflags dbus-glib-1` diff --git a/rpm_spec/gui-dom0.spec.in b/rpm_spec/gui-dom0.spec.in index b06470f7..3925e1f8 100644 --- a/rpm_spec/gui-dom0.spec.in +++ b/rpm_spec/gui-dom0.spec.in @@ -72,6 +72,7 @@ The Qubes GUI virtualization infrastructure that needs to be installed in Dom0. %setup -q %build +%{?set_build_flags} make clean make all BACKEND_VMM=@BACKEND_VMM@