Steven Chamberlain wrote: > To better handle this long-term, you may want to change from a > whitelist to a blacklist, as it would be a shorter list now:
Attached is a patch doing that. It's the most maintainable way I can think of handling this. Thanks, Regards, -- Steven Chamberlain [email protected]
diff -Nru haskell-hslua-0.4.1.orig/debian/control haskell-hslua-0.4.1/debian/control --- haskell-hslua-0.4.1.orig/debian/control 2016-01-21 08:05:29.000000000 +0000 +++ haskell-hslua-0.4.1/debian/control 2016-04-01 12:00:56.555128962 +0100 @@ -10,7 +10,8 @@ ghc-prof, pkg-config, liblua5.1-0-dev, - libluajit-5.1-dev [amd64 armel armhf i386 mips mipsel powerpc hurd-i386 kfreebsd-i386], +# REMINDER: also update the list in debian/rules + libluajit-5.1-dev (>= 2.1.0~) [!ppc64el !s390x !alpha !hppa !mips64el !ppc64 !sparc64 !x32], libghc-hspec-dev, libghc-hspec-contrib-dev, libghc-hunit-dev, diff -Nru haskell-hslua-0.4.1.orig/debian/rules haskell-hslua-0.4.1/debian/rules --- haskell-hslua-0.4.1.orig/debian/rules 2016-01-20 10:26:01.000000000 +0000 +++ haskell-hslua-0.4.1/debian/rules 2016-04-01 12:06:37.197924346 +0100 @@ -1,20 +1,14 @@ #!/usr/bin/make -f -ifeq (,$(filter $(DEB_BUILD_ARCH),amd64 armel armhf i386 mips mipsel powerpc hurd-i386 kfreebsd-i386 kfreebsd-amd64)) -DEB_SETUP_GHC_CONFIGURE_ARGS += --flags=-luajit -else +# By default, assume new arches will have luajit. +# Otherwise, porters may ask to be added to this blacklist. +# REMINDER: also update the list in debian/control +ifeq (,$(filter $(DEB_BUILD_ARCH),ppc64el s390x alpha hppa mips64el ppc64 sparc64 x32)) DEB_SETUP_GHC_CONFIGURE_ARGS += --flags=luajit +else +DEB_SETUP_GHC_CONFIGURE_ARGS += --flags=-luajit endif -# To avoid duplicating the architecture data from debian/control, check for -# existence of luajit here. But this would do the wrong thing in a hypothetical -# unclean environment. So we do duplicate :-( -#ifeq (0,$(shell pkg-config --exists luajit; echo $$?)) -#DEB_SETUP_GHC_CONFIGURE_ARGS += --flags=luajit -#else -#DEB_SETUP_GHC_CONFIGURE_ARGS += --flags=-luajit -#endif - DEB_ENABLE_TESTS = yes include /usr/share/cdbs/1/rules/debhelper.mk
signature.asc
Description: Digital signature
