← Back to branch summary

~ubuntu-branches/ubuntu/natty/python3.1/natty-security

« back to all changes in this revision

Viewing changes to debian/patches/link-opt.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2010-07-06 16:52:42 UTC
  • mfrom: (1.2.1 upstream) (2.1.11 sid)
  • Revision ID: james.westby@ubuntu.com-20100706165242-2xv4i019r3et6c0j
Tags: 3.1.2+20100706-1ubuntu1
* Merge with Debian; remaining changes:
  - Regenerate the control file.
  - Add debian/patches/overwrite-semaphore-check for Lucid buildds.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/link-opt.dpatch
1
 
#! /bin/sh -e
2
 
 
3
 
# DP: Call the linker with -O1 -Bsymbolic-functions
4
 
 
5
 
dir=
6
 
if [ $# -eq 3 -a "$2" = '-d' ]; then
7
 
    pdir="-d $3"
8
 
    dir="$3/"
9
 
elif [ $# -ne 1 ]; then
10
 
    echo >&2 "usage: `basename $0`: -patch|-unpatch [-d <srcdir>]"
11
 
    exit 1
12
 
fi
13
 
case "$1" in
14
 
    -patch)
15
 
        patch $pdir -f --no-backup-if-mismatch -p0 < $0
16
 
        autoconf
17
 
        ;;
18
 
    -unpatch)
19
 
        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
20
 
        rm -f configure
21
 
        ;;
22
 
    *)
23
 
        echo >&2 "usage: `basename $0`: -patch|-unpatch [-d <srcdir>]"
24
 
        exit 1
25
 
esac
26
 
exit 0
27
 
 
28
 
--- configure.in~       2008-07-15 15:37:42.000000000 +0200
29
 
+++ configure.in        2008-07-15 15:39:53.000000000 +0200
30
 
@@ -1659,7 +1659,7 @@
31
 
                        fi
32
 
                fi
33
 
                ;;
34
 
-       Linux*|GNU*|QNX*) LDSHARED='$(CC) -shared';;
35
 
+       Linux*|GNU*|QNX*) LDSHARED='$(CC) -shared -Wl,-O1 -Wl,-Bsymbolic-functions';;
36
 
        BSD/OS*/4*) LDSHARED="gcc -shared";;
37
 
        FreeBSD*)
38
 
                if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]]
39
 
@@ -1746,7 +1746,7 @@
40
 
            LINKFORSHARED="-Wl,-E -Wl,+s";;
41
 
 #          LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";;
42
 
        BSD/OS/4*) LINKFORSHARED="-Xlinker -export-dynamic";;
43
 
-       Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";;
44
 
+       Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic -Wl,-O1 -Wl,-Bsymbolic-functions";;
45
 
        # -u libsys_s pulls in all symbols in libsys
46
 
        Darwin/*) 
47
 
                # -u _PyMac_Error is needed to pull in the mac toolbox glue,