← Back to branch summary

~ubuntu-branches/ubuntu/quantal/python2.7/quantal-updates

« back to all changes in this revision

Viewing changes to debian/patches/plat-linux2_mips.diff

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2011-11-30 19:16:23 UTC
  • mfrom: (36.1.5 sid)
  • Revision ID: package-import@ubuntu.com-20111130191623-ov9hszutdakcsnbz
Tags: 2.7.2-8
https://launchpad.net/bugs/898172
http://bugs.debian.org/647419
http://bugs.debian.org/650181
* Update to 20111130, taken from the 2.7 branch.
* New patch, ctypes-arm, allow for ",hard-float" after libc6 in ldconfig -p
  output (Loic Minier). LP: #898172.
* debian/rules: Define DPKG_VARS (Alban Browaeys). Closes: #647419).
* Add python-config man page (Johann Felix Soden). Closes: #650181).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/plat-linux2_mips.diff
86
86
 SOCK_RAW = 3
87
87
 SOCK_RDM = 4
88
88
 SOCK_SEQPACKET = 5
89
 
Index: Lib/plat-linux3/DLFCN.py
90
 
===================================================================
91
 
--- ./Lib/plat-linux3/DLFCN.py  (Revision 77754)
92
 
+++ ./Lib/plat-linux3/DLFCN.py  (Arbeitskopie)
93
 
@@ -77,7 +77,7 @@
94
 
 RTLD_LAZY = 0x00001
95
 
 RTLD_NOW = 0x00002
96
 
 RTLD_BINDING_MASK = 0x3
97
 
-RTLD_NOLOAD = 0x00004
98
 
-RTLD_GLOBAL = 0x00100
99
 
+RTLD_NOLOAD = 0x00008
100
 
+RTLD_GLOBAL = 0x00004
101
 
 RTLD_LOCAL = 0
102
 
 RTLD_NODELETE = 0x01000
103
 
Index: Lib/plat-linux3/IN.py
104
 
===================================================================
105
 
--- ./Lib/plat-linux3/IN.py     (Revision 77754)
106
 
+++ ./Lib/plat-linux3/IN.py     (Arbeitskopie)
107
 
@@ -436,33 +436,33 @@
108
 
 # Included from asm/socket.h
109
 
 
110
 
 # Included from asm/sockios.h
111
 
-FIOSETOWN = 0x8901
112
 
-SIOCSPGRP = 0x8902
113
 
-FIOGETOWN = 0x8903
114
 
-SIOCGPGRP = 0x8904
115
 
-SIOCATMARK = 0x8905
116
 
+FIOSETOWN = 0x8004667c
117
 
+SIOCSPGRP = 0x80047308
118
 
+FIOGETOWN = 0x4004667b
119
 
+SIOCGPGRP = 0x40047309
120
 
+SIOCATMARK = 0x40047307
121
 
 SIOCGSTAMP = 0x8906
122
 
-SOL_SOCKET = 1
123
 
-SO_DEBUG = 1
124
 
-SO_REUSEADDR = 2
125
 
-SO_TYPE = 3
126
 
-SO_ERROR = 4
127
 
-SO_DONTROUTE = 5
128
 
-SO_BROADCAST = 6
129
 
-SO_SNDBUF = 7
130
 
-SO_RCVBUF = 8
131
 
-SO_KEEPALIVE = 9
132
 
-SO_OOBINLINE = 10
133
 
+SOL_SOCKET = 0xffff
134
 
+SO_DEBUG = 0x0001
135
 
+SO_REUSEADDR = 0x0004
136
 
+SO_TYPE = 0x1008
137
 
+SO_ERROR = 0x1007
138
 
+SO_DONTROUTE = 0x0010
139
 
+SO_BROADCAST = 0x0020
140
 
+SO_SNDBUF = 0x1001
141
 
+SO_RCVBUF = 0x1002
142
 
+SO_KEEPALIVE = 0x0008
143
 
+SO_OOBINLINE = 0x0100
144
 
 SO_NO_CHECK = 11
145
 
 SO_PRIORITY = 12
146
 
-SO_LINGER = 13
147
 
+SO_LINGER = 0x0080
148
 
 SO_BSDCOMPAT = 14
149
 
-SO_PASSCRED = 16
150
 
-SO_PEERCRED = 17
151
 
-SO_RCVLOWAT = 18
152
 
-SO_SNDLOWAT = 19
153
 
-SO_RCVTIMEO = 20
154
 
-SO_SNDTIMEO = 21
155
 
+SO_PASSCRED = 17
156
 
+SO_PEERCRED = 18
157
 
+SO_RCVLOWAT = 0x1004
158
 
+SO_SNDLOWAT = 0x1003
159
 
+SO_RCVTIMEO = 0x1006
160
 
+SO_SNDTIMEO = 0x1005
161
 
 SO_SECURITY_AUTHENTICATION = 22
162
 
 SO_SECURITY_ENCRYPTION_TRANSPORT = 23
163
 
 SO_SECURITY_ENCRYPTION_NETWORK = 24
164
 
@@ -472,9 +472,9 @@
165
 
 SO_PEERNAME = 28
166
 
 SO_TIMESTAMP = 29
167
 
 SCM_TIMESTAMP = SO_TIMESTAMP
168
 
-SO_ACCEPTCONN = 30
169
 
-SOCK_STREAM = 1
170
 
-SOCK_DGRAM = 2
171
 
+SO_ACCEPTCONN = 0x1009
172
 
+SOCK_STREAM = 2
173
 
+SOCK_DGRAM = 1
174
 
 SOCK_RAW = 3
175
 
 SOCK_RDM = 4
176
 
 SOCK_SEQPACKET = 5