rpms
/
splix
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Use %(CXX) instead of hardcoding g++

This commit is contained in:
Timm Bäder 2020-11-17 15:45:42 +01:00
parent 857206f68c
commit 218e2a3122
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
splix-cxx.patch Normal file
View File

@ -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

2
splix.spec
View File

@ -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