summaryrefslogtreecommitdiff
path: root/debian/patches/15_jam.patch
blob: 411d667714858c2c685456e5c6fd6146af1fb49d (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
Description: Add multiarch support to jam files
Author: Jörg Frings Fürst <debian@jff-webhosting.net>
Forwarded: http://www.freelists.org/post/argyllcms/Some-buildsystem-issues
Last-Update: 2015-05-02
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: trunk/Jambase
===================================================================
--- trunk.orig/Jambase
+++ trunk/Jambase
@@ -941,7 +941,7 @@ else if $(UNIX)
 
 	# UNIX defaults
 
-	CCFLAGS			?= -DUNIX -D_THREAD_SAFE -pipe ;
+	CCFLAGS			?= $(CPPFLAGS) -g -DUNIX -D_THREAD_SAFE -pipe ;
 	CCOPTFLAG		?= -O2 ;		
 	CCDEBUGFLAG		?= -g ;		
 	CCPROFFLAG		?= ;		
@@ -951,7 +951,7 @@ else if $(UNIX)
 	CHGRP			?= chgrp ;
 	CHOWN			?= chown ;
 	LEX				?= lex ;
-	LINKFLAGS		?= ;
+	LINKFLAGS		?= $(LDFLAGS) ;
 	LINKOPTFLAG		?= -O ;				# Affects creating .so's
 	LINKSTRIPFLAG	?= -s ;
 	LINKDEBUGFLAG	?= ;
@@ -1037,7 +1037,7 @@ else if $(UNIX)
 	RMDIR			?= $(RM) ;
 	RSH				?= rsh ;
 	SED				?= sed ;
-	SHELLHEADER		?= "#!/bin/sh" ;
+	SHELLHEADER		?= "#!/bin/bash" ;
 	SHELLMODE		?= 755 ;
 	SLASH			?= / ;
 	STDHDRS			?= /usr/include ;