From 218e2a3122f7b833562fef287cdb9566d03bc1bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timm=20B=C3=A4der?= Date: Tue, 17 Nov 2020 15:45:42 +0100 Subject: [PATCH] Use %(CXX) instead of hardcoding g++ --- splix-cxx.patch | 18 ++++++++++++++++++ splix.spec | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 splix-cxx.patch diff --git a/splix-cxx.patch b/splix-cxx.patch new file mode 100644 index 0000000..21e7ad0 --- /dev/null +++ b/splix-cxx.patch @@ -0,0 +1,18 @@ +diff -ruN splix.orig/rules.mk splix/rules.mk +--- splix.orig/rules.mk 2020-11-17 15:29:33.504520423 +0100 ++++ splix/rules.mk 2020-11-17 15:30:12.081410829 +0100 +@@ -6,12 +6,12 @@ + + $(rastertoqpdl_TARGET): $(rastertoqpdl_OBJ) + $(call printCmd, $(cmd_link)) +- $(Q)g++ -o $@ $^ $(rastertoqpdl_CXXFLAGS) $(rastertoqpdl_LDFLAGS) $(LDFLAGS) \ ++ $(Q)$(CXX) -o $@ $^ $(rastertoqpdl_CXXFLAGS) $(rastertoqpdl_LDFLAGS) $(LDFLAGS) \ + $(rastertoqpdl_LIBS) + + $(pstoqpdl_TARGET): $(pstoqpdl_OBJ) + $(call printCmd, $(cmd_link)) +- $(Q)g++ -o $@ $^ $(pstoqpdl_CXXFLAGS) $(pstoqpdl_LDFLAGS) $(LDFLAGS) \ ++ $(Q)$(CXX) -o $@ $^ $(pstoqpdl_CXXFLAGS) $(pstoqpdl_LDFLAGS) $(LDFLAGS) \ + $(pstoqpdl_LIBS) + + .PHONY: install installcms diff --git a/splix.spec b/splix.spec index a003b81..654aafd 100644 --- a/splix.spec +++ b/splix.spec @@ -16,6 +16,7 @@ Source0: splix-%{version}.%{checkout}.tar.bz2 Patch0: splix-deviceID.patch # rules.mk misses LDFLAGS Patch1: splix-ldflags.patch +Patch2: splix-cxx.patch Requires: cups @@ -52,6 +53,7 @@ popd %patch0 -p1 -b .deviceID %patch1 -p1 -b .ldflags +%patch2 -p1 -b .cxx %build %set_build_flags