Hello,
on my work on the new argyll package I found some issues:
- on debian sid the tiffio.h is installed on
/usr/include/x86_64-linux-gnu or
/usr/include/i386-linux-gnu
- libtiff.(so|a) are also installed on
/usr/lib/i386-linux-gnu
- The if clauses
if ! $(BUILTIN_TIFF) && $(UNIX) and
if ! $(HAVE_TIFF) || $(BUILTIN_TIFF)
don't run with the default shell "/bin/sh".
With "/bin/bash" it seems ok.
- The debhelper build flags
$(CPPFLAGS) and
$(LDFLAGS)
are not included.
For this I have the patch file 15_jam.patch attached.
CU
Jörg
--
pgp Fingerprint: 7D13 3C60 0A10 DBE1 51F8 EBCB 422B 44B0 BE58 1B6E
pgp Key: BE581B6E
CAcert Key S/N: 0E:D4:56
Jörg Frings-Fürst
D-54526 Niederkail
Threema: SYR8SJXB
IRC: j_f-f@xxxxxxxxxxxx
j_f-f@xxxxxxxx
Description: Add multiarch support to jam files Author: Jörg Frings Fürst <debian@xxxxxxxxxxxxxxxxxx> Forwarded: Last-Update: 2014-09-06 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ Index: trunk/Jamtop =================================================================== --- trunk.orig/Jamtop 2014-09-07 20:15:02.520225484 +0200 +++ trunk/Jamtop 2014-09-07 20:15:43.909089670 +0200 @@ -109,12 +109,16 @@ # 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/include : tiffio.h ] || [ GLOB /usr/local/include : tiffio.h ] + || [ GLOB /usr/include/x86_64-linux-gnu : tiffio.h ] + || [ GLOB /usr/include/i386-linux-gnu : 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 ] { + || [ GLOB /usr/lib/i386-linux-gnu : libtiff.so ] + || [ GLOB /usr/lib/i386-linux-gnu : libtiff.a ] + || [ GLOB /usr/local/lib : libtiff.so ] || [ GLOB /usr/local/lib : libtiff.a ] { echo "Using system TIFF library" ; TIFFLIB = ; TIFFINC = ; @@ -124,6 +128,7 @@ } } + # If nothing else, use Argyll supplied TIFF library if ! $(HAVE_TIFF) || $(BUILTIN_TIFF) { echo "Using Argyll TIFF library" ; Index: trunk/Jambase =================================================================== --- trunk.orig/Jambase 2014-09-07 20:15:02.520225484 +0200 +++ trunk/Jambase 2014-09-07 20:15:02.512225317 +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 ;
Attachment:
signature.asc
Description: This is a digitally signed message part
