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
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
|
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: 2014-09-25
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: trunk/Jamtop
===================================================================
--- trunk.orig/Jamtop 2014-09-28 14:35:52.016329546 +0200
+++ trunk/Jamtop 2014-09-28 14:44:07.039261307 +0200
@@ -109,12 +109,17 @@
# See if we have a system TIFF library.
if ! $(BUILTIN_TIFF) && $(UNIX) {
- if [ GLOB /usr/include : tiffio.h ] || [ GLOB /usr/local/include : tiffio.h ] {
- if [ GLOB /usr/lib : libtiff.so ] || [ GLOB /usr/lib : libtiff.a ]
- || [ GLOB /usr/lib64 : libtiff.so ] || [ GLOB /usr/lib64 : libtiff.a ]
- || [ GLOB /usr/lib/x86_64-linux-gnu : libtiff.so ]
- || [ GLOB /usr/lib/x86_64-linux-gnu : libtiff.a ]
- || [ GLOB /usr/local/lib : libtiff.so ] || [ GLOB /usr/local/lib : libtiff.a ] {
+ if [ GLOB /usr/include : tiffio.h ]
+ || [ GLOB /usr/local/include : tiffio.h ]
+ || [ GLOB /usr/include/$(DEB_HOST_MULTIARCH) : tiffio.h ] {
+ if [ GLOB /usr/lib : libtiff.so ]
+ || [ GLOB /usr/lib : libtiff.a ]
+ || [ GLOB /usr/lib64 : libtiff.so ]
+ || [ GLOB /usr/lib64 : libtiff.a ]
+ || [ GLOB /usr/lib/$(DEB_HOST_MULTIARCH) : libtiff.so ]
+ || [ GLOB /usr/lib/$(DEB_HOST_MULTIARCH) : libtiff.a ]
+ || [ GLOB /usr/local/lib : libtiff.so ]
+ || [ GLOB /usr/local/lib : libtiff.a ] {
echo "Using system TIFF library" ;
TIFFLIB = ;
TIFFINC = ;
@@ -124,6 +129,7 @@
}
}
+
# If nothing else, use Argyll supplied TIFF library
if ! $(HAVE_TIFF) || $(BUILTIN_TIFF) {
echo "Using Argyll TIFF library" ;
@@ -133,12 +139,16 @@
# See if we have a system JPEG library.
if ! $(BUILTIN_JPEG) && $(UNIX) {
- if [ GLOB /usr/include : jpeglib.h ] || [ GLOB /usr/local/include : jpeglib.h ] {
- if [ GLOB /usr/lib : libjpeg.so ] || [ GLOB /usr/lib : libjpeg.a ]
- || [ GLOB /usr/lib64 : libjpeg.so ] || [ GLOB /usr/lib64 : libjpeg.a ]
- || [ GLOB /usr/lib/x86_64-linux-gnu : libjpeg.so ]
- || [ GLOB /usr/lib/x86_64-linux-gnu : libjpeg.a ]
- || [ GLOB /usr/local/lib : libjpeg.so ] || [ GLOB /usr/local/lib : libjpeg.a ] {
+ if [ GLOB /usr/include : jpeglib.h ]
+ || [ GLOB /usr/local/include : jpeglib.h ] {
+ if [ GLOB /usr/lib : libjpeg.so ]
+ || [ GLOB /usr/lib : libjpeg.a ]
+ || [ GLOB /usr/lib64 : libjpeg.so ]
+ || [ GLOB /usr/lib64 : libjpeg.a ]
+ || [ GLOB /usr/lib/$(DEB_HOST_MULTIARCH) : libjpeg.so ]
+ || [ GLOB /usr/lib/$(DEB_HOST_MULTIARCH) : libjpeg.a ]
+ || [ GLOB /usr/local/lib : libjpeg.so ]
+ || [ GLOB /usr/local/lib : libjpeg.a ] {
echo "Using system JPEG library" ;
JPEGLIB = ;
JPEGINC = ;
Index: trunk/Jambase
===================================================================
--- trunk.orig/Jambase 2014-09-28 14:35:52.016329546 +0200
+++ trunk/Jambase 2014-09-28 14:35:52.016329546 +0200
@@ -880,7 +880,7 @@
# UNIX defaults
- CCFLAGS ?= -DUNIX -D_THREAD_SAFE -pipe ;
+ CCFLAGS ?= $(CPPFLAGS) -g -DUNIX -D_THREAD_SAFE -pipe ;
CCOPTFLAG ?= -O2 ;
CCDEBUGFLAG ?= -g ;
CCPROFFLAG ?= ;
@@ -890,7 +890,7 @@
CHGRP ?= chgrp ;
CHOWN ?= chown ;
LEX ?= lex ;
- LINKFLAGS ?= ;
+ LINKFLAGS ?= $(LDFLAGS) ;
LINKOPTFLAG ?= -O ; # Affects creating .so's
LINKSTRIPFLAG ?= -s ;
LINKDEBUGFLAG ?= ;
@@ -971,7 +971,7 @@
RMDIR ?= $(RM) ;
RSH ?= rsh ;
SED ?= sed ;
- SHELLHEADER ?= "#!/bin/sh" ;
+ SHELLHEADER ?= "#!/bin/bash" ;
SHELLMODE ?= 755 ;
SLASH ?= / ;
STDHDRS ?= /usr/include ;
|
