On 10/24/2010 09:59 PM, Luke Faraone wrote: > On 10/24/2010 03:22 PM, Jakub Wilk wrote: >> * Luke Faraone <lfara...@debian.org>, 2010-10-24, 13:55: >>> When attempting to build this package with pyversions of 2.6-, the >>> package FTBFS because it expects there to be a "build/lib" directory. >>> Versions of Python after 2.5.x do not create this directory. >> AFAIK we haven't removed Python 2.5 from the set of supported versions yet. > > Right, I was unclear whether this would merit "does-not-build" or not. > My apologies. > >> The patch you committed is incorrect: the package will FTBFS on some >> architectures or if DEB_* variables were not exported into environment. > > I've added the following: > DEB_BUILD_ARCH_OS := $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS) > DEB_HOST_GNU_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
Why use the DEB_* stuff at all? The way I see it, the following should change to PYTHONPATH should sufficed: PYTHONPATH=$(shell ls -d $(CURDIR)/build/lib* | head -n 1) ie, pick the first lib directory found instead of hard-coding the 2.5 lib directory. Christian
Index: trunk/debian/rules =================================================================== --- trunk/debian/rules (revision 14743) +++ trunk/debian/rules (working copy) @@ -9,18 +9,11 @@ %: dh $@ -DEB_BUILD_ARCH_OS := $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS) -DEB_HOST_GNU_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU) - override_dh_auto_test: ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) set -e ; \ cd tests/keyczar/; \ for py in $(PYVERS); do \ - if [ "$$py" \< "2.6" ]; then \ - PYTHONPATH=$(CURDIR)/build/lib python$$py alltests.py; \ - else \ - PYTHONPATH=$(CURDIR)/build/lib.$(DEB_BUILD_ARCH_OS)-$(DEB_HOST_GNU_CPU)-$$py python$$py alltests.py; \ - fi; \ + PYTHONPATH=$(shell ls -d $(CURDIR)/build/lib* | head -n 1) python$$py alltests.py; \ done endif
signature.asc
Description: OpenPGP digital signature
