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

« back to all changes in this revision

Viewing changes to debian/patches/profiled-build.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:
1
 
#! /bin/sh -e
2
 
 
3
 
# DP: Fix profiled build; don't use Python/thread.gc*, gcc complains.
4
 
# DP: Ignore errors in the profile task.
5
 
 
6
 
dir=
7
 
if [ $# -eq 3 -a "$2" = '-d' ]; then
8
 
    pdir="-d $3"
9
 
    dir="$3/"
10
 
elif [ $# -ne 1 ]; then
11
 
    echo >&2 "usage: `basename $0`: -patch|-unpatch [-d <srcdir>]"
12
 
    exit 1
13
 
fi
14
 
case "$1" in
15
 
    -patch)
16
 
        patch $pdir -f --no-backup-if-mismatch -p0 < $0
17
 
        ;;
18
 
    -unpatch)
19
 
        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
20
 
        ;;
21
 
    *)
22
 
        echo >&2 "usage: `basename $0`: -patch|-unpatch [-d <srcdir>]"
23
 
        exit 1
24
 
esac
25
 
exit 0
26
 
 
27
 
--- Makefile.pre.in.orig        2008-11-18 22:37:15.000000000 +0000
28
 
+++ Makefile.pre.in     2008-11-23 14:49:12.000000000 +0000
29
 
@@ -368,9 +368,11 @@
30
 
        $(MAKE) all CFLAGS="$(CFLAGS) -fprofile-generate" LIBS="$(LIBS) -lgcov"
31
 
 
32
 
 run_profile_task:
33
 
-       ./$(BUILDPYTHON) $(PROFILE_TASK)
34
 
+       -./$(BUILDPYTHON) $(PROFILE_TASK)
35
 
 
36
 
 build_all_use_profile:
37
 
+       : # FIXME: gcc error
38
 
+       rm -f Python/thread.gc* Modules/_ssl.gc*
39
 
        $(MAKE) all CFLAGS="$(CFLAGS) -fprofile-use"
40
 
 
41
 
 coverage: