From 65dadeec086fd9e61bda368331fa6db5e8b9850b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 12 Jun 2015 10:44:25 +0200 Subject: Correct FTBFS on mips64el --- debian/changelog | 3 ++- debian/patches/15_jam.patch | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5f73dd0..90bfa07 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,8 @@ argyll (1.7.0+repack-3) UNRELEASED; urgency=medium * debian/watch: - change opts to support for "+repack". - * Change buildsystem from jam to ftjam. + * debian/patches/15_jam.patch: + - Add support for mips64el (Closes: #788447). -- Jörg Frings-Fürst Thu, 07 May 2015 11:03:35 +0200 diff --git a/debian/patches/15_jam.patch b/debian/patches/15_jam.patch index 2e2a3f5..2809967 100644 --- a/debian/patches/15_jam.patch +++ b/debian/patches/15_jam.patch @@ -47,7 +47,7 @@ Index: trunk/Jamtop # Tell standalone libraries that they are part of Argyll: DEFINES += ARGYLLCMS ; -@@ -132,16 +133,76 @@ rule CheckForLibrary { +@@ -132,16 +133,79 @@ rule CheckForLibrary { if ! $(BUILTIN_$(UCASE)) && $(UNIX) { if [ GLOB /usr/include : $(lcase).h $(lcase)lib.h ] @@ -67,6 +67,7 @@ Index: trunk/Jamtop + || [ 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 ] @@ -107,6 +108,8 @@ Index: trunk/Jamtop + || [ 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 ] -- cgit v1.2.3