소스 검색

Disable pypy-dulwich build on architectures where pypy is not available (hurd-any, m68k, sh4, x32).

Jelmer Vernooij 8 년 전
부모
커밋
12f8dd78ca
3개의 변경된 파일6개의 추가작업 그리고 3개의 파일을 삭제
  1. 2 0
      debian/changelog
  2. 2 2
      debian/control
  3. 2 1
      debian/rules

+ 2 - 0
debian/changelog

@@ -5,6 +5,8 @@ dulwich (0.16.2-1) UNRELEASED; urgency=medium
   * Update homepage to www.dulwich.io.
   * Drop (now unnecessary) workaround for #799485.
   * Add autopkgtest for python3 testsuite.
+  * Disable pypy-dulwich build on architectures where pypy is not
+    available (hurd-any, m68k, sh4, x32).
 
  -- Jelmer Vernooij <jelmer@debian.org>  Sun, 08 Jan 2017 02:12:51 +0000
 

+ 2 - 2
debian/control

@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
 Uploaders: Jelmer Vernooij <jelmer@debian.org>
 Homepage: https://www.dulwich.io/
-Build-Depends: python-all-dev (>= 2.6.6-3), python-all-dbg (>= 2.6.6-3), python3-all-dev, python3-all-dbg, debhelper (>= 9), python-unittest2, git (>= 1:1.7.0.4-2) | git-core, python-fastimport (>= 0.9.0~bzr293), python3-fastimport, pypy-dev, dh-python
+Build-Depends: python-all-dev (>= 2.6.6-3), python-all-dbg (>= 2.6.6-3), python3-all-dev, python3-all-dbg, debhelper (>= 9), python-unittest2, git (>= 1:1.7.0.4-2) | git-core, python-fastimport (>= 0.9.0~bzr293), python3-fastimport, pypy-dev [!hurd-any !m68k !sh4 !x32], dh-python
 Standards-Version: 3.9.8
 X-Python-Version: >= 2.7
 X-Python3-Version: >= 3.2
@@ -48,7 +48,7 @@ Description: Python Git library - Debug Extension
  This package contains the extensions built for the Python debug interpreter.
 
 Package: pypy-dulwich
-Architecture: any
+Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el s390x alpha hppa kfreebsd-any powerpc powerpcspe ppc64 sparc64
 Provides: ${pypy:Provides}
 Depends: ${pypy:Depends}, ${misc:Depends}, ${shlibs:Depends}
 Recommends: pypy-fastimport

+ 2 - 1
debian/rules

@@ -9,7 +9,8 @@ LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 pythonpath = $$(ls -d $(CURDIR)/build/lib.*-$(1))
 pythonpath_dbg = $$(ls -d $(CURDIR)/build/lib_d.*-$(1) 2>/dev/null || ls -d $(CURDIR)/build/lib.*$(1)-pydebug)
 
-pyflavours = python2,python3,pypy
+pyflavours = python2,python3
+pyflavours += $(shell which pypy >/dev/null && echo ,pypy)
 
 %:
 	dh $* --with $(pyflavours) --buildsystem=python_distutils