Your message dated Wed, 4 May 2011 17:34:15 -0500
with message-id <[email protected]>
and subject line Re: Bug#605424: subversion: Python 2.7 compatibility
has caused the Debian Bug report #605424,
regarding Misc potential FTBFS fixes
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
605424: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=605424
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: subversion
Version: 1.6.12dfsg-1
Severity: minor
Tags: patch
User: [email protected]
Usertags: origin-ubuntu natty ubuntu-patch
Hi there
subversion was failing to build in Ubuntu for various reasons
I wanted to share the workaround and fix we have applied with you as
you will probably hit them at some point
One of them is I believe python2.7 related; Barry Warsaw worked on that
one, you might want to get in touch with him about it if you need
further details. I think it's more a workaround than a fix though.
The other one is related to debian/tools/svn-make-config; this seems to
build against the wrong .la file, and misses a link with -lapr. I
suspect this bug is triggered by stricted link flags in Ubuntu (thinks
like --no-add-needed and --as-needed).
I'm attaching the full debdiff of the changes from Barry and myself.
Cheers
--
Loïc Minier
diff -u subversion-1.6.12dfsg/debian/rules subversion-1.6.12dfsg/debian/rules
--- subversion-1.6.12dfsg/debian/rules
+++ subversion-1.6.12dfsg/debian/rules
@@ -367,7 +367,7 @@
# Create our default configuration files to be installed in
# /etc/subversion/
$(MAKE) -C debian/tools \
- LD_LIBRARY_PATH=$(CURDIR)/debian/tmp/usr/lib \
+
LD_LIBRARY_PATH="$(CURDIR)/debian/tmp/usr/lib$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}"
\
DEB_SRCDIR=$(CURDIR) DEB_BUILDDIR=$(CURDIR)/$(DEB_BUILDDIR)
$(MAKE_B) install-swig-pl-lib \
diff -u subversion-1.6.12dfsg/debian/changelog
subversion-1.6.12dfsg/debian/changelog
--- subversion-1.6.12dfsg/debian/changelog
+++ subversion-1.6.12dfsg/debian/changelog
@@ -1,3 +1,26 @@
+subversion (1.6.12dfsg-2ubuntu3) natty; urgency=low
+
+ * debian/tools/Makefile: add APR_LIBS and use it when linking
+ svn-make-config:
+ APR_LIBS = `apr-config --ldflags --link-ld --libs`
+
+ -- Loïc Minier <[email protected]> Sat, 20 Nov 2010 11:21:18 +0100
+
+subversion (1.6.12dfsg-2ubuntu2) natty; urgency=low
+
+ [ Barry Warsaw ]
+ * Fix FTBFS against Python 2.7 by disabling some problematic tests.
+ (LP: #670139)
+
+ [ Loïc Minier ]
+ * Fix FTBFS in natty; LP: #670139; thanks Barry Warsaw.
+ - Don't override LD_LIBRARY_PATH completely but prepend to it as to not
+ break fakeroot.
+ - debian/tools/Makefile: svn_config_ensure() moved from
+ libsvn_client/libsvn_client-1.la to libsvn_subr/libsvn_subr-1.la.
+
+ -- Barry Warsaw <[email protected]> Fri, 12 Nov 2010 15:16:04 -0500
+
subversion (1.6.12dfsg-2ubuntu1) natty; urgency=low
* Merge from debian unstable. Remaining changes:
diff -u subversion-1.6.12dfsg/debian/tools/Makefile
subversion-1.6.12dfsg/debian/tools/Makefile
--- subversion-1.6.12dfsg/debian/tools/Makefile
+++ subversion-1.6.12dfsg/debian/tools/Makefile
@@ -1,4 +1,5 @@
APR_CFLAGS = `apr-config --cppflags --includes --cflags`
+APR_LIBS = `apr-config --ldflags --link-ld --libs`
SVN_INC = -I$(DEB_SRCDIR)/subversion/include
CFLAGS += -Wall \
$(SVN_INC) \
@@ -10,7 +11,7 @@
./svn-make-config
svn-make-config: svn-make-config.o
- libtool --mode=link gcc svn-make-config.o
$(DEB_BUILDDIR)/subversion/libsvn_client/libsvn_client-1.la -o svn-make-config
+ libtool --mode=link gcc $(APR_LIBS) svn-make-config.o
$(DEB_BUILDDIR)/subversion/libsvn_subr/libsvn_subr-1.la -o svn-make-config
clean:
$(RM) svn-make-config svn-make-config.o
only in patch2:
unchanged:
--- subversion-1.6.12dfsg.orig/subversion/bindings/swig/python/tests/client.py
+++ subversion-1.6.12dfsg/subversion/bindings/swig/python/tests/client.py
@@ -7,6 +7,31 @@
REPOS_PATH, REPOS_URL
from urlparse import urljoin
+
+
+# XXX 2010-08-18 barry
+# Skip the test when run under Python 2.7.
+#
+# These tests are apparently known failures. No fix or bug number is yet
+# available, and this is the only reference I've been able to find.
+#
+#
http://article.gmane.org/gmane.comp.version-control.subversion.devel/120567/match=python+2.7
+
+def XXX_py27_skip(function):
+ import sys
+ from functools import wraps
+ if sys.version_info < (2, 7):
+ @wraps(function)
+ def wrapper(*args, **kws):
+ return function(*args, **kws)
+ return wrapper
+ else:
+ @wraps(function)
+ def wrapper(*args, **kws):
+ print >> sys.stderr, 'SKIP', function.__name__, 'PYTHON 2.7'
+ return wrapper
+
+
class SubversionClientTestCase(unittest.TestCase):
"""Test cases for the basic SWIG Subversion client layer"""
@@ -116,6 +141,7 @@
temp_client_ctx = None
self.assertEqual(test_object2(), None)
+ @XXX_py27_skip
def test_checkout(self):
"""Test svn_client_checkout2."""
@@ -131,6 +157,7 @@
client.checkout2(REPOS_URL, path, rev, rev, True, True,
self.client_ctx)
+ @XXX_py27_skip
def test_info(self):
"""Test svn_client_info on an empty repository"""
@@ -147,6 +174,7 @@
self.assertEqual(self.info.URL, REPOS_URL)
self.assertEqual(self.info.repos_root_URL, REPOS_URL)
+ @XXX_py27_skip
def test_mkdir_url(self):
"""Test svn_client_mkdir2 on a file:// URL"""
dir = urljoin(REPOS_URL+"/", "dir1")
@@ -155,6 +183,7 @@
self.assertEqual(commit_info.revision, 13)
self.assertEqual(self.log_message_func_calls, 1)
+ @XXX_py27_skip
def test_mkdir_url_with_revprops(self):
"""Test svn_client_mkdir3 on a file:// URL, with added revprops"""
dir = urljoin(REPOS_URL+"/", "some/deep/subdir")
@@ -164,6 +193,7 @@
self.assertEqual(commit_info.revision, 14)
self.assertEqual(self.log_message_func_calls, 1)
+ @XXX_py27_skip
def test_log3_url(self):
"""Test svn_client_log3 on a file:// URL"""
dir = urljoin(REPOS_URL+"/", "trunk/dir1")
@@ -180,12 +210,14 @@
self.assert_(dir in self.changed_paths)
self.assertEqual(self.changed_paths[dir].action, 'A')
+ @XXX_py27_skip
def test_uuid_from_url(self):
"""Test svn_client_uuid_from_url on a file:// URL"""
self.assert_(isinstance(
client.uuid_from_url(REPOS_URL, self.client_ctx),
types.StringTypes))
+ @XXX_py27_skip
def test_url_from_path(self):
"""Test svn_client_url_from_path for a file:// URL"""
self.assertEquals(client.url_from_path(REPOS_URL), REPOS_URL)
@@ -200,6 +232,7 @@
self.assertEquals(client.url_from_path(path), REPOS_URL)
+ @XXX_py27_skip
def test_uuid_from_path(self):
"""Test svn_client_uuid_from_path."""
rev = core.svn_opt_revision_t()
@@ -218,11 +251,13 @@
self.assert_(isinstance(client.uuid_from_path(path, wc_adm,
self.client_ctx), types.StringTypes))
+ @XXX_py27_skip
def test_open_ra_session(self):
"""Test svn_client_open_ra_session()."""
client.open_ra_session(REPOS_URL, self.client_ctx)
+ @XXX_py27_skip
def test_info_file(self):
"""Test svn_client_info on working copy file and remote files."""
--- End Message ---
--- Begin Message ---
[Jakub Wilk]
> subversion has been now successfully rebuilt against python2.7 on all
> Linux architectures. (It FTBFS on kfreebsd-*, but that seems to be
> unrelated, and there's a separate bug for that.)
Thanks for the reminder - closing. Reopen if it happens again.
--- End Message ---
