Fix FTCBFS: Use triplet-prefixed compilers
Closes: #837182
Helmut Grohne authored 7 years ago
Didier Raboud committed 7 years ago
|
0 |
From: Helmut Grohne <helmut@subdivi.de>
|
|
1 |
Subject: Use compilers passed to make
|
|
2 |
|
|
3 |
Index: splix-2.0.0+svn315/rules.mk
|
|
4 |
===================================================================
|
|
5 |
--- splix-2.0.0+svn315.orig/rules.mk
|
|
6 |
+++ splix-2.0.0+svn315/rules.mk
|
|
7 |
@@ -6,12 +6,12 @@
|
|
8 |
|
|
9 |
$(rastertoqpdl_TARGET): $(rastertoqpdl_OBJ)
|
|
10 |
$(call printCmd, $(cmd_link))
|
|
11 |
- $(Q)g++ -o $@ $^ $(rastertoqpdl_CXXFLAGS) $(rastertoqpdl_LDFLAGS) \
|
|
12 |
+ $(Q)$(CXX) -o $@ $^ $(rastertoqpdl_CXXFLAGS) $(rastertoqpdl_LDFLAGS) \
|
|
13 |
$(rastertoqpdl_LIBS)
|
|
14 |
|
|
15 |
$(pstoqpdl_TARGET): $(pstoqpdl_OBJ)
|
|
16 |
$(call printCmd, $(cmd_link))
|
|
17 |
- $(Q)g++ -o $@ $^ $(pstoqpdl_CXXFLAGS) $(pstoqpdl_LDFLAGS) \
|
|
18 |
+ $(Q)$(CXX) -o $@ $^ $(pstoqpdl_CXXFLAGS) $(pstoqpdl_LDFLAGS) \
|
|
19 |
$(pstoqpdl_LIBS)
|
|
20 |
|
|
21 |
.PHONY: install installcms
|
| 1 | 1 |
0002-Dont-let-bash-trim-whitespace.patch
|
| 2 | 2 |
0003-fix-aready-typo.patch
|
| 3 | 3 |
0005-Set-debian-build-flags-during-build.patch
|
|
4 |
0006-cross.patch
|
| 4 | 4 |
|
| 5 | 5 |
# Harden
|
| 6 | 6 |
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
|
|
7 |
include /usr/share/dpkg/architecture.mk
|
|
8 |
ifeq ($(origin CC),default)
|
|
9 |
CC = $(DEB_HOST_GNU_TYPE)-gcc
|
|
10 |
endif
|
|
11 |
ifeq ($(origin CXX),default)
|
|
12 |
CXX = $(DEB_HOST_GNU_TYPE)-g++
|
|
13 |
endif
|
| 7 | 14 |
|
| 8 | 15 |
derives_from_ubuntu := $(shell (dpkg-vendor --derives-from Ubuntu && echo "yes") || echo "no")
|
| 9 | 16 |
|
|
| 17 | 24 |
build-indep: build-stamp
|
| 18 | 25 |
build-stamp: configure-stamp
|
| 19 | 26 |
dh_testdir
|
| 20 | |
$(MAKE) V=1 drv
|
| 21 | |
$(MAKE) V=1 DRV_ONLY=1 rastertoqpdl_LIBS="-lcupsimage -lcups -lpthread -ljbig" pstoqpdl_LIBS="-lcupsimage -lcups -ljbig"
|
|
27 |
$(MAKE) V=1 drv CC=$(CC) CXX=$(CXX)
|
|
28 |
$(MAKE) V=1 DRV_ONLY=1 rastertoqpdl_LIBS="-lcupsimage -lcups -lpthread -ljbig" pstoqpdl_LIBS="-lcupsimage -lcups -ljbig" CC=$(CC) CXX=$(CXX)
|
| 22 | 29 |
touch $@
|
| 23 | 30 |
|
| 24 | 31 |
clean:
|