diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/patches/15_jam.patch | 87 |
2 files changed, 93 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 6e5305e..e9897c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +argyll (1.7.0+repack-2) UNRELEASED; urgency=medium + + * debian/patches/15_jam.patch: + - Rewrite rules to find libraries on all architectures. + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Mon, 04 May 2015 09:03:23 +0200 + argyll (1.7.0+repack-1) unstable; urgency=low * Set package type to +repack. diff --git a/debian/patches/15_jam.patch b/debian/patches/15_jam.patch index 411d667..13cca3b 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-02 +Last-Update: 2015-05-04 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ Index: trunk/Jambase @@ -35,3 +35,88 @@ Index: trunk/Jambase SHELLMODE ?= 755 ; SLASH ?= / ; STDHDRS ?= /usr/include ; +Index: trunk/Jamtop +=================================================================== +--- trunk.orig/Jamtop ++++ trunk/Jamtop +@@ -132,16 +132,76 @@ 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/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 ] +- || [ 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/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 = ; |