Now that bug #563882 is fixed in glibc, we should drop the workaround (commit 92796ab5, 2010-01-26).
So reject builds that fail the test suite on ia64 again. Also update the package dependencies to help buildds and users avoid the glibc problem. Signed-off-by: Jonathan Nieder <[email protected]> --- Jonathan Nieder wrote: > This patch uses Recommends: instead of Depends: because git > (though not ‘git diff’) is still usable without the fix. Scratch that. Better to use the stronger dependency to avoid breakage. Sorry for the noise. debian/changelog | 8 ++++++++ debian/control | 6 ++++-- debian/rules | 15 --------------- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9a7a81a..e077209 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +git-core (1:1.6.6.1-2) unstable; urgency=low + + * debian/rules: stop ignoring test suite failures on ia64, since + #563882 has been fixed. Build-Depends: and Depends: + libc6.1 (>= 2.10.2-6) [ia64] for the fix (closes: #568915). + + -- Jonathan Nieder <[email protected]> Mon, 08 Feb 2010 13:42:13 -0600 + git-core (1:1.6.6.1-1) unstable; urgency=low [ Gerrit Pape ] diff --git a/debian/control b/debian/control index 74da9bf..81f841e 100644 --- a/debian/control +++ b/debian/control @@ -2,13 +2,15 @@ Source: git-core Section: vcs Priority: optional Maintainer: Gerrit Pape <[email protected]> -Build-Depends: libz-dev, libcurl4-gnutls-dev | libcurl3-gnutls-dev, asciidoc (>> 8.0.0), xmlto, docbook-xsl (>> 1.72), libexpat1-dev, subversion, libsvn-perl | libsvn-core-perl, unzip, tcl8.5, gettext, cvs, cvsps, libdbd-sqlite3-perl +Build-Depends: libz-dev, libcurl4-gnutls-dev | libcurl3-gnutls-dev, asciidoc (>> 8.0.0), xmlto, docbook-xsl (>> 1.72), libexpat1-dev, subversion, libsvn-perl | libsvn-core-perl, unzip, tcl8.5, gettext, cvs, cvsps, libdbd-sqlite3-perl, + libc6.1 (>= 2.10.2-6) [ia64] Standards-Version: 3.8.2.0 Vcs-Git: http://smarden.org/git/git.git/ Package: git-core Architecture: any -Depends: ${shlibs:Depends}, perl-modules, liberror-perl, libdigest-sha1-perl +Depends: ${shlibs:Depends}, perl-modules, liberror-perl, libdigest-sha1-perl, + libc6.1 (>= 2.10.2-6) [ia64] Recommends: patch, less, rsync, ssh-client Suggests: git-doc, git-arch, git-cvs, git-svn, git-email, git-daemon-run, git-gui, gitk, gitweb Replaces: cogito (<< 0.16rc2-0), git-completion diff --git a/debian/rules b/debian/rules index 9bf17e8..79bd444 100755 --- a/debian/rules +++ b/debian/rules @@ -28,10 +28,6 @@ endif ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) TEST = endif -# work around #563882 -ifeq (ia64,$(ARCH)) - TEST = -endif TMP =$(shell pwd)/tmp GIT =$(shell pwd)/debian/git @@ -53,17 +49,6 @@ build-arch-stamp: patch-stamp build-indep-stamp CC='$(CC)' CFLAGS='$(CFLAGS)' $(OPTS) || \ GIT_TEST_OPTS=--verbose DESTDIR='$(GIT)'-core $(MAKE) $(TEST) \ CC='$(CC)' CFLAGS='$(CFLAGS)' $(OPTS) -ifeq (ia64,$(ARCH)) - : 'ignoring test suite failures (see Bug#563882)' - @set -e; \ - cd t; for i in t[0-9][0-9][0-9][0-9]-*.sh; do \ - sh $$i --verbose || :; \ - done - DESTDIR='$(GIT)'-core $(MAKE) -C t/ aggregate-results \ - CC='$(CC)' CFLAGS='$(CFLAGS)' $(OPTS) - DESTDIR='$(GIT)'-core $(MAKE) -C t/ clean \ - CC='$(CC)' CFLAGS='$(CFLAGS)' $(OPTS) -endif touch build-arch-stamp build-indep-stamp: $(MAKE) -CDocumentation man html ASCIIDOC8=YesPlease ASCIIDOC_NO_ROFF=Yes -- 1.7.0.rc1 -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
