← Back to branch summary

~ubuntu-branches/ubuntu/precise/vlc/precise-proposed

« back to all changes in this revision

Viewing changes to contrib/src/ogg/libogg-1.1.patch

  • Committer: Package Import Robot
  • Author(s): Benjamin Drung
  • Date: 2012-03-24 01:33:03 UTC
  • mfrom: (1.1.46) (3.5.39 sid)
  • Revision ID: package-import@ubuntu.com-20120324013303-km51kpl9kixydb8g
http://bugs.debian.org/613121
http://bugs.debian.org/662217
Really add the preinst from Didier Raboud to vlc to drop it's doc directory
before unpacking a symlink to vlc-nox's over it. (Closes: #613121, #662217)

Show diffs side-by-side

added added

removed removed

Lines of Context:
contrib/src/ogg/libogg-1.1.patch
 
1
--- libogg/configure.in 2010-11-01 21:13:42.000000000 +0100
 
2
+++ libogg.new/configure.in     2010-11-03 23:59:54.267733114 +0100
 
3
@@ -28,17 +28,17 @@
 
4
         case $host in 
 
5
         *-*-irix*)
 
6
                 DEBUG="-g -signed" 
 
7
-                CFLAGS="-O2 -w -signed"
 
8
+                EXTRA_CFLAGS="-O2 -w -signed"
 
9
                 PROFILE="-p -g3 -O2 -signed"
 
10
                ;;
 
11
         sparc-sun-solaris*)
 
12
                 DEBUG="-v -g"
 
13
-                CFLAGS="-xO4 -fast -w -fsimple -native -xcg92"
 
14
+                EXTRA_CFLAGS="-xO4 -fast -w -fsimple -native -xcg92"
 
15
                 PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc"
 
16
                ;;
 
17
         *)
 
18
                 DEBUG="-g"
 
19
-                CFLAGS="-O"
 
20
+                EXTRA_CFLAGS="-O"
 
21
                 PROFILE="-g -p" 
 
22
                ;;
 
23
         esac
 
24
@@ -46,27 +46,27 @@
 
25
         case $host in 
 
26
         *-*-linux*)
 
27
                 DEBUG="-g -Wall -fsigned-char"
 
28
-                CFLAGS="-O20 -Wall -ffast-math -fsigned-char"
 
29
+                EXTRA_CFLAGS="-O20 -Wall -ffast-math -fsigned-char"
 
30
                 PROFILE="-Wall -W -pg -g -O20 -ffast-math -fsigned-char"
 
31
                ;;
 
32
         sparc-sun-*)
 
33
                 DEBUG="-g -Wall -fsigned-char"
 
34
-                CFLAGS="-O20 -ffast-math -fsigned-char"
 
35
+                EXTRA_CFLAGS="-O20 -ffast-math -fsigned-char"
 
36
                 PROFILE="-pg -g -O20 -fsigned-char" 
 
37
                ;;
 
38
        *-*-darwin*)
 
39
                DEBUG="-fno-common -g -Wall -fsigned-char"
 
40
-               CFLAGS="-fno-common -O4 -Wall -fsigned-char -ffast-math"
 
41
+               EXTRA_CFLAGS="-fno-common -O4 -Wall -fsigned-char -ffast-math"
 
42
                PROFILE="-fno-common -O4 -Wall -pg -g -fsigned-char -ffast-math"
 
43
                ;;
 
44
         *)
 
45
                 DEBUG="-g -Wall -fsigned-char"
 
46
-                CFLAGS="-O20 -fsigned-char"
 
47
+                EXTRA_CFLAGS="-O20 -fsigned-char"
 
48
                 PROFILE="-O20 -g -pg -fsigned-char" 
 
49
                ;;
 
50
         esac
 
51
 fi
 
52
-CFLAGS="$CFLAGS $cflags_save"
 
53
+CFLAGS="$EXTRA_CFLAGS $cflags_save"
 
54
 DEBUG="$DEBUG $cflags_save"
 
55
 PROFILE="$PROFILE $cflags_save"
 
56