Use %(CXX) instead of hardcoding g++
This commit is contained in:
parent
857206f68c
commit
218e2a3122
|
@ -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
|
|
@ -16,6 +16,7 @@ Source0: splix-%{version}.%{checkout}.tar.bz2
|
||||||
Patch0: splix-deviceID.patch
|
Patch0: splix-deviceID.patch
|
||||||
# rules.mk misses LDFLAGS
|
# rules.mk misses LDFLAGS
|
||||||
Patch1: splix-ldflags.patch
|
Patch1: splix-ldflags.patch
|
||||||
|
Patch2: splix-cxx.patch
|
||||||
|
|
||||||
Requires: cups
|
Requires: cups
|
||||||
|
|
||||||
|
@ -52,6 +53,7 @@ popd
|
||||||
|
|
||||||
%patch0 -p1 -b .deviceID
|
%patch0 -p1 -b .deviceID
|
||||||
%patch1 -p1 -b .ldflags
|
%patch1 -p1 -b .ldflags
|
||||||
|
%patch2 -p1 -b .cxx
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%set_build_flags
|
%set_build_flags
|
||||||
|
|
Loading…
Reference in New Issue