summaryrefslogtreecommitdiff
path: root/debian/patches/15_jam.patch
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2015-08-23 13:36:53 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2015-08-23 13:36:53 +0200
commit37e6883f5d3d33900fc739ba3a4b33ca7521eedc (patch)
treed567cd91a3300e0d5f2ea115d8d4fc6d17632495 /debian/patches/15_jam.patch
parentbc3604d9b226ac475a104cd8ae2ca2d1d4a27984 (diff)
Refresh patches
Diffstat (limited to 'debian/patches/15_jam.patch')
-rw-r--r--debian/patches/15_jam.patch166
1 files changed, 88 insertions, 78 deletions
diff --git a/debian/patches/15_jam.patch b/debian/patches/15_jam.patch
index 2809967..251f61f 100644
--- a/debian/patches/15_jam.patch
+++ b/debian/patches/15_jam.patch
@@ -1,7 +1,7 @@
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-04
+Last-Update: 2015-08-23
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: trunk/Jambase
@@ -47,87 +47,97 @@ Index: trunk/Jamtop
# Tell standalone libraries that they are part of Argyll:
DEFINES += ARGYLLCMS ;
-@@ -132,16 +133,79 @@ rule CheckForLibrary {
+@@ -139,17 +140,82 @@ rule CheckForLibrary {
+ }
if ! $(BUILTIN_$(UCASE)) && $(UNIX) {
- if [ GLOB /usr/include : $(lcase).h $(lcase)lib.h ]
-- || [ GLOB /usr/local/include : $(lcase).h $(lcase)lib.h ]
-+ || [ GLOB /usr/local/include : $(lcase).h $(lcase)lib.h ]
- || [ GLOB /usr/include/x86_64-linux-gnu : $(lcase).h $(lcase)lib.h ]
-- || [ GLOB /usr/include/i386-linux-gnu : $(lcase).h $(lcase)lib.h ] {
-+ || [ GLOB /usr/include/i386-linux-gnu : $(lcase).h $(lcase)lib.h ]
-+ || [ GLOB /usr/include/alpha-linux-gnu : $(lcase).h $(lcase)lib.h ]
-+ || [ GLOB /usr/include/aarch64-linux-gnu : $(lcase).h $(lcase)lib.h ]
-+ || [ GLOB /usr/include/arm-linux-gnueabi : $(lcase).h $(lcase)lib.h ]
-+ || [ GLOB /usr/include/arm-linux-gnueabihf : $(lcase).h $(lcase)lib.h ]
-+ || [ GLOB /usr/include/hppa-linux-gnu : $(lcase).h $(lcase)lib.h ]
-+ || [ GLOB /usr/include/i386-gnu : $(lcase).h $(lcase)lib.h ]
-+ || [ GLOB /usr/include/x86_64-kfreebsd-gnu : $(lcase).h $(lcase)lib.h ]
-+ || [ GLOB /usr/include/i386-kfreebsd-gnu : $(lcase).h $(lcase)lib.h ]
-+ || [ GLOB /usr/include/m68k-linux-gnu : $(lcase).h $(lcase)lib.h ]
-+ || [ GLOB /usr/include/mips-linux-gnu : $(lcase).h $(lcase)lib.h ]
-+ || [ GLOB /usr/include/mipsel-linux-gnu : $(lcase).h $(lcase)lib.h ]
-+ || [ GLOB /usr/include/mips64el-linux-gnuabi64 : $(lcase).h $(lcase)lib.h ]
-+ || [ GLOB /usr/include/powerpc-linux-gnu : $(lcase).h $(lcase)lib.h ]
-+ || [ GLOB /usr/include/powerpc-linux-gnuspe : $(lcase).h $(lcase)lib.h ]
-+ || [ GLOB /usr/include/powerpc64-linux-gnu : $(lcase).h $(lcase)lib.h ]
-+ || [ GLOB /usr/include/powerpc64le-linux-gnu : $(lcase).h $(lcase)lib.h ]
-+ || [ GLOB /usr/include/s390x-linux-gnu : $(lcase).h $(lcase)lib.h ]
-+ || [ GLOB /usr/include/sh4-linux-gnu : $(lcase).h $(lcase)lib.h ]
-+ || [ GLOB /usr/include/sparc-linux-gnu : $(lcase).h $(lcase)lib.h ]
-+ || [ GLOB /usr/include/sparc64-linux-gnu : $(lcase).h $(lcase)lib.h ]
-+ || [ GLOB /usr/include/x86_64-linux-gnux32 : $(lcase).h $(lcase)lib.h ] {
- if [ GLOB /usr/lib : lib$(lcase).so ] || [ GLOB /usr/lib : lib$(lcase).a ]
- || [ GLOB /usr/local/lib : lib$(lcase).so ] || [ GLOB /usr/local/lib : lib$(lcase).a ]
- || [ GLOB /usr/lib64 : lib$(lcase).so ] || [ GLOB /usr/lib64 : lib$(lcase).a ]
- || [ GLOB /usr/lib/x86_64-linux-gnu : lib$(lcase).so ]
- || [ GLOB /usr/lib/x86_64-linux-gnu : lib$(lcase).a ]
+- if [ GLOB /usr/include$(subd) : $(lcase).h $(lcase)lib.h ]
+- || [ GLOB /usr/local/include$(subd) : $(lcase).h $(lcase)lib.h ]
+- || [ GLOB /usr/include/x86_64-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
+- || [ GLOB /usr/include/i386-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ] {
+- if [ GLOB /usr/lib : lib$(lcase).so ] || [ GLOB /usr/lib : lib$(lcase).a ]
+- || [ GLOB /usr/local/lib : lib$(lcase).so ] || [ GLOB /usr/local/lib : lib$(lcase).a ]
+- || [ GLOB /usr/lib64 : lib$(lcase).so ] || [ GLOB /usr/lib64 : lib$(lcase).a ]
+- || [ GLOB /usr/lib/x86_64-linux-gnu : lib$(lcase).so ]
+- || [ GLOB /usr/lib/x86_64-linux-gnu : lib$(lcase).a ]
- || [ GLOB /usr/lib/i386-linux-gnu : lib$(lcase).so ]
- || [ GLOB /usr/lib/i386-linux-gnu : lib$(lcase).a ] {
-+ || [ GLOB /usr/lib/i386-linux-gnu : lib$(lcase).so ]
-+ || [ GLOB /usr/lib/i386-linux-gnu : lib$(lcase).a ]
-+ || [ GLOB /usr/lib/alpha-linux-gnu : lib$(lcase).so ]
-+ || [ GLOB /usr/lib/alpha-linux-gnu : lib$(lcase).a ]
-+ || [ GLOB /usr/lib/aarch64-linux-gnu : lib$(lcase).so ]
-+ || [ GLOB /usr/lib/aarch64-linux-gnu : lib$(lcase).a ]
-+ || [ GLOB /usr/lib/arm-linux-gnueabi : lib$(lcase).so ]
-+ || [ GLOB /usr/lib/arm-linux-gnueabi : lib$(lcase).a ]
-+ || [ GLOB /usr/lib/arm-linux-gnueabihf : lib$(lcase).so ]
-+ || [ GLOB /usr/lib/arm-linux-gnueabihf : lib$(lcase).a ]
-+ || [ GLOB /usr/lib/hppa-linux-gnu : lib$(lcase).so ]
-+ || [ GLOB /usr/lib/hppa-linux-gnu : lib$(lcase).a ]
-+ || [ GLOB /usr/lib/i386-gnu : lib$(lcase).so ]
-+ || [ GLOB /usr/lib/i386-gnu : lib$(lcase).a ]
-+ || [ GLOB /usr/lib/x86_64-kfreebsd-gnu : lib$(lcase).so ]
-+ || [ GLOB /usr/lib/x86_64-kfreebsd-gnu : lib$(lcase).a ]
-+ || [ GLOB /usr/lib/i386-kfreebsd-gnu : lib$(lcase).so ]
-+ || [ GLOB /usr/lib/i386-kfreebsd-gnu : lib$(lcase).a ]
-+ || [ GLOB /usr/lib/m68k-linux-gnu : lib$(lcase).so ]
-+ || [ GLOB /usr/lib/m68k-linux-gnu : lib$(lcase).a ]
-+ || [ GLOB /usr/lib/mips-linux-gnu : lib$(lcase).so ]
-+ || [ GLOB /usr/lib/mips-linux-gnu : lib$(lcase).a ]
-+ || [ GLOB /usr/lib/mipsel-linux-gnu : lib$(lcase).so ]
-+ || [ GLOB /usr/lib/mipsel-linux-gnu : lib$(lcase).a ]
-+ || [ GLOB /usr/lib/mips64el-linux-gnuabi64 : lib$(lcase).so ]
-+ || [ GLOB /usr/lib/mips64el-linux-gnuabi64 : lib$(lcase).a ]
-+ || [ GLOB /usr/lib/powerpc-linux-gnu : lib$(lcase).so ]
-+ || [ GLOB /usr/lib/powerpc-linux-gnu : lib$(lcase).a ]
-+ || [ GLOB /usr/lib/powerpc-linux-gnuspe : lib$(lcase).so ]
-+ || [ GLOB /usr/lib/powerpc-linux-gnuspe : lib$(lcase).a ]
-+ || [ GLOB /usr/lib/powerpc64-linux-gnu : lib$(lcase).so ]
-+ || [ GLOB /usr/lib/powerpc64-linux-gnu : lib$(lcase).a ]
-+ || [ GLOB /usr/lib/powerpc64le-linux-gnu : lib$(lcase).so ]
-+ || [ GLOB /usr/lib/powerpc64le-linux-gnu : lib$(lcase).a ]
-+ || [ GLOB /usr/lib/s390x-linux-gnu : lib$(lcase).so ]
-+ || [ GLOB /usr/lib/s390x-linux-gnu : lib$(lcase).a ]
-+ || [ GLOB /usr/lib/sh4-linux-gnu : lib$(lcase).so ]
-+ || [ GLOB /usr/lib/sh4-linux-gnu : lib$(lcase).a ]
-+ || [ GLOB /usr/lib/sparc-linux-gnu : lib$(lcase).so ]
-+ || [ GLOB /usr/lib/sparc-linux-gnu : lib$(lcase).a ]
-+ || [ GLOB /usr/lib/sparc64-linux-gnu : lib$(lcase).so ]
-+ || [ GLOB /usr/lib/sparc64-linux-gnu : lib$(lcase).a ]
-+ || [ GLOB /usr/lib/x86_64-linux-gnux32 : lib$(lcase).so ]
-+ || [ GLOB /usr/lib/x86_64-linux-gnux32 : lib$(lcase).a ] {
++ if [ GLOB /usr/include$(subd) : $(lcase).h $(lcase)lib.h ]
++ || [ GLOB /usr/local/include$(subd) : $(lcase).h $(lcase)lib.h ]
++ || [ GLOB /usr/include/x86_64-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
++ || [ GLOB /usr/include/i386-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
++ || [ GLOB /usr/include/alpha-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
++ || [ GLOB /usr/include/aarch64-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
++ || [ GLOB /usr/include/arm-linux-gnueabi$(subd) : $(lcase).h $(lcase)lib.h ]
++ || [ GLOB /usr/include/arm-linux-gnueabihf$(subd) : $(lcase).h $(lcase)lib.h ]
++ || [ GLOB /usr/include/hppa-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
++ || [ GLOB /usr/include/i386-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
++ || [ GLOB /usr/include/x86_64-kfreebsd-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
++ || [ GLOB /usr/include/i386-kfreebsd-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
++ || [ GLOB /usr/include/m68k-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
++ || [ GLOB /usr/include/mips-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
++ || [ GLOB /usr/include/mipsel-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
++ || [ GLOB /usr/include/mips64el-linux-gnuabi64$(subd) : $(lcase).h $(lcase)lib.h ]
++ || [ GLOB /usr/include/powerpc-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
++ || [ GLOB /usr/include/powerpc-linux-gnuspe$(subd) : $(lcase).h $(lcase)lib.h ]
++ || [ GLOB /usr/include/powerpc64-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
++ || [ GLOB /usr/include/powerpc64le-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
++ || [ GLOB /usr/include/s390x-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
++ || [ GLOB /usr/include/sh4-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
++ || [ GLOB /usr/include/sparc-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
++ || [ GLOB /usr/include/sparc64-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
++ || [ GLOB /usr/include/x86_64-linux-gnux32$(subd) : $(lcase).h $(lcase)lib.h ] {
++ if [ GLOB /usr/lib : lib$(lcase).so ] || [ GLOB /usr/lib : lib$(lcase).a ]
++ || [ GLOB /usr/local/lib : lib$(lcase).so ]
++ || [ GLOB /usr/local/lib : lib$(lcase).a ]
++ || [ GLOB /usr/lib64 : lib$(lcase).so ]
++ || [ GLOB /usr/lib64 : lib$(lcase).a ]
++ || [ GLOB /usr/lib/x86_64-linux-gnu : lib$(lcase).so ]
++ || [ GLOB /usr/lib/x86_64-linux-gnu : lib$(lcase).a ]
++ || [ GLOB /usr/lib/i386-linux-gnu : lib$(lcase).so ]
++ || [ GLOB /usr/lib/i386-linux-gnu : lib$(lcase).a ]
++ || [ GLOB /usr/lib/alpha-linux-gnu : lib$(lcase).so ]
++ || [ GLOB /usr/lib/alpha-linux-gnu : lib$(lcase).a ]
++ || [ GLOB /usr/lib/aarch64-linux-gnu : lib$(lcase).so ]
++ || [ GLOB /usr/lib/aarch64-linux-gnu : lib$(lcase).a ]
++ || [ GLOB /usr/lib/arm-linux-gnueabi : lib$(lcase).so ]
++ || [ GLOB /usr/lib/arm-linux-gnueabi : lib$(lcase).a ]
++ || [ GLOB /usr/lib/arm-linux-gnueabihf : lib$(lcase).so ]
++ || [ GLOB /usr/lib/arm-linux-gnueabihf : lib$(lcase).a ]
++ || [ GLOB /usr/lib/hppa-linux-gnu : lib$(lcase).so ]
++ || [ GLOB /usr/lib/hppa-linux-gnu : lib$(lcase).a ]
++ || [ GLOB /usr/lib/i386-gnu : lib$(lcase).so ]
++ || [ GLOB /usr/lib/i386-gnu : lib$(lcase).a ]
++ || [ GLOB /usr/lib/x86_64-kfreebsd-gnu : lib$(lcase).so ]
++ || [ GLOB /usr/lib/x86_64-kfreebsd-gnu : lib$(lcase).a ]
++ || [ GLOB /usr/lib/i386-kfreebsd-gnu : lib$(lcase).so ]
++ || [ GLOB /usr/lib/i386-kfreebsd-gnu : lib$(lcase).a ]
++ || [ GLOB /usr/lib/m68k-linux-gnu : lib$(lcase).so ]
++ || [ GLOB /usr/lib/m68k-linux-gnu : lib$(lcase).a ]
++ || [ GLOB /usr/lib/mips-linux-gnu : lib$(lcase).so ]
++ || [ GLOB /usr/lib/mips-linux-gnu : lib$(lcase).a ]
++ || [ GLOB /usr/lib/mipsel-linux-gnu : lib$(lcase).so ]
++ || [ GLOB /usr/lib/mipsel-linux-gnu : lib$(lcase).a ]
++ || [ GLOB /usr/lib/mips64el-linux-gnuabi64 : lib$(lcase).so ]
++ || [ GLOB /usr/lib/mips64el-linux-gnuabi64 : lib$(lcase).a ]
++ || [ GLOB /usr/lib/powerpc-linux-gnu : lib$(lcase).so ]
++ || [ GLOB /usr/lib/powerpc-linux-gnu : lib$(lcase).a ]
++ || [ GLOB /usr/lib/powerpc-linux-gnuspe : lib$(lcase).so ]
++ || [ GLOB /usr/lib/powerpc-linux-gnuspe : lib$(lcase).a ]
++ || [ GLOB /usr/lib/powerpc64-linux-gnu : lib$(lcase).so ]
++ || [ GLOB /usr/lib/powerpc64-linux-gnu : lib$(lcase).a ]
++ || [ GLOB /usr/lib/powerpc64le-linux-gnu : lib$(lcase).so ]
++ || [ GLOB /usr/lib/powerpc64le-linux-gnu : lib$(lcase).a ]
++ || [ GLOB /usr/lib/s390x-linux-gnu : lib$(lcase).so ]
++ || [ GLOB /usr/lib/s390x-linux-gnu : lib$(lcase).a ]
++ || [ GLOB /usr/lib/sh4-linux-gnu : lib$(lcase).so ]
++ || [ GLOB /usr/lib/sh4-linux-gnu : lib$(lcase).a ]
++ || [ GLOB /usr/lib/sparc-linux-gnu : lib$(lcase).so ]
++ || [ GLOB /usr/lib/sparc-linux-gnu : lib$(lcase).a ]
++ || [ GLOB /usr/lib/sparc64-linux-gnu : lib$(lcase).so ]
++ || [ GLOB /usr/lib/sparc64-linux-gnu : lib$(lcase).a ]
++ || [ GLOB /usr/lib/x86_64-linux-gnux32 : lib$(lcase).so ]
++ || [ GLOB /usr/lib/x86_64-linux-gnux32 : lib$(lcase).a ] {
echo "Using system $(UCASE) library" ;
$(UCASE)LIB = ;
$(UCASE)INC = ;