← Back to branch summary

~ubuntu-branches/ubuntu/trusty/pysvn/trusty

« back to all changes in this revision

Viewing changes to debian/patches/02-fix-ld-shared.patch

  • Committer: Package Import Robot
  • Author(s): Robie Basak
  • Date: 2013-01-24 13:58:38 UTC
  • mfrom: (15.1.2 sid)
  • Revision ID: package-import@ubuntu.com-20130124135838-a3vlzpgvdfdpzq85
Tags: 1.7.6-0.3ubuntu1
https://launchpad.net/bugs/1104078
https://launchpad.net/bugs/1045021
* Merge from Debian unstable (LP: #1104078).  Remaining changes:
  - debian/patches/02-fix-ld-shared.patch:
    + Fix linking with -lsvn* (LP: #1045021)
* debian/patches/python-multiarch-include.patch: fix include paths for new
  multiarch include locations.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/02-fix-ld-shared.patch
12
12
 
13
13
--- a/Source/setup_configure.py
14
14
+++ b/Source/setup_configure.py
15
 
@@ -875,7 +875,7 @@
 
15
@@ -883,7 +883,7 @@
16
16
 
17
17
         rules.append( '%s : %s' % (target_filename, ' '.join( all_objects )) )
18
18
         rules.append( '\t@echo Link %s' % (target_filename,) )
21
21
 
22
22
         self.makePrint( self.expand( '\n'.join( rules ) ) )
23
23
 
24
 
@@ -1156,7 +1156,7 @@
 
24
@@ -1164,7 +1164,7 @@
25
25
 
26
26
         self._addVar( 'CCCFLAGS',   ' '.join( py_cflags_list ) )
27
27
         self._addVar( 'LDLIBS',     ' '.join( self._getLdLibs() ) )