summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2011-02-08 15:21:49 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2011-02-08 17:37:52 +0100
commit82754f1357b2c87150124d9a90dc3e7cf24066a6 (patch)
tree744ffa7a29bf992e861c08de7bc8424f3b9f4dc6 /patches
parent88013259211e91e8ea7bc557000f1a46bfe8136b (diff)
downloadptxdist-82754f1357b2c87150124d9a90dc3e7cf24066a6.tar.gz
ptxdist-82754f1357b2c87150124d9a90dc3e7cf24066a6.tar.xz
python: version bump 2.6.4 -> 2.6.6
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r--patches/Python-2.6.4/0001-Add-support-for-socketcan-to-the-python-socket-modul.patch225
-rw-r--r--patches/Python-2.6.4/0002--configure.in-chflags.patch56
-rw-r--r--patches/Python-2.6.4/0003--configure.in-lchflags.patch56
-rw-r--r--patches/Python-2.6.4/series19
-rw-r--r--patches/Python-2.6.6/0001-Add-support-for-socketcan-to-the-python-socket-modul.patch227
-rw-r--r--patches/Python-2.6.6/0002-printf-format-zd.patch (renamed from patches/Python-2.6.4/0004--configure.in-printf-format-zd.patch)11
-rw-r--r--patches/Python-2.6.6/0003-use-AC_COMPILE_IFELSE-rather-than-AC_TRY_RUN.patch (renamed from patches/Python-2.6.4/0005-use-AC_COMPILE_IFELSE-rather-than-AC_TRY_RUN.patch)13
-rw-r--r--patches/Python-2.6.6/0004-use-AC_CHECK_SIZEOF-rather-than-AC_TRY_COMPILE-for-l.patch (renamed from patches/Python-2.6.4/0006-use-AC_CHECK_SIZEOF-rather-than-AC_TRY_COMPILE-for-l.patch)7
-rw-r--r--patches/Python-2.6.6/0005-use-AC_TYPE_LONG_DOUBLE-to-detect-long-double-suppor.patch (renamed from patches/Python-2.6.4/0007-use-AC_TYPE_LONG_DOUBLE-to-detect-long-double-suppor.patch)7
-rw-r--r--patches/Python-2.6.6/0006-use-AC_CHECK_SIZEOF-rather-than-handcrafted-test-wit.patch (renamed from patches/Python-2.6.4/0008-use-AC_CHECK_SIZEOF-rather-than-handcrafted-test-wit.patch)11
-rw-r--r--patches/Python-2.6.6/0007-fix-silent-flag.patch (renamed from patches/Python-2.6.4/0009-fix-silent-flag.patch)11
-rw-r--r--patches/Python-2.6.6/0008-use-PGEN_FOR_BUILD.patch (renamed from patches/Python-2.6.4/0010-use-PGEN_FOR_BUILD.patch)5
-rw-r--r--patches/Python-2.6.6/0009-introduce-and-use-PYTHON_FOR_BUILD.patch (renamed from patches/Python-2.6.4/0011-introduce-and-use-PYTHON_FOR_BUILD.patch)31
-rw-r--r--patches/Python-2.6.6/0010-distutils-introduce-and-use-EXECUTABLE_DIRNAME.patch (renamed from patches/Python-2.6.4/0012-distutils-introduce-and-use-EXECUTABLE_DIRNAME.patch)43
-rw-r--r--patches/Python-2.6.6/0011-setup.py-don-t-leak-host-path-into-cross-compilation.patch (renamed from patches/Python-2.6.4/0013-setup.py-don-t-leak-host-path-into-cross-compilatio.patch)23
-rw-r--r--patches/Python-2.6.6/0012-setup.py-skip-import-check-while-cross-compiling.patch (renamed from patches/Python-2.6.4/0014-setup.py-skip-import-check-while-cross-compiling.patch)7
-rw-r--r--patches/Python-2.6.6/0013-add-cross-compilation-support.patch (renamed from patches/Python-2.6.4/0015-add-cross-compilation-support.patch)25
-rw-r--r--patches/Python-2.6.6/0014-provide-wrapper-for-cross-python.patch (renamed from patches/Python-2.6.4/0016-provide-wrapper-for-cross-python.patch)11
-rw-r--r--patches/Python-2.6.6/0015-0017-fix-for-new-autoconf.diff.patch (renamed from patches/Python-2.6.4/0017-fix-for-new-autoconf.diff)15
-rw-r--r--patches/Python-2.6.6/0016-0018-dont-add-rpaths.diff.patch (renamed from patches/Python-2.6.4/0018-dont-add-rpaths.diff)19
-rw-r--r--patches/Python-2.6.6/0017-assume-non-buggy-getaddrinfo-when-cross-compiling.patch (renamed from patches/Python-2.6.4/0019-assume-non-buggy-getaddrinfo-when-cross-compiling.patch)6
-rwxr-xr-xpatches/Python-2.6.6/autogen.sh (renamed from patches/Python-2.6.4/autogen.sh)0
-rw-r--r--patches/Python-2.6.6/series19
23 files changed, 365 insertions, 482 deletions
diff --git a/patches/Python-2.6.4/0001-Add-support-for-socketcan-to-the-python-socket-modul.patch b/patches/Python-2.6.4/0001-Add-support-for-socketcan-to-the-python-socket-modul.patch
deleted file mode 100644
index 57d8c814d..000000000
--- a/patches/Python-2.6.4/0001-Add-support-for-socketcan-to-the-python-socket-modul.patch
+++ /dev/null
@@ -1,225 +0,0 @@
-From 7f8972018c739fedf709f6d25405fa5505d226c7 Mon Sep 17 00:00:00 2001
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Tue, 5 May 2009 15:17:20 +0200
-Subject: [PATCH] Add support for socketcan to the python socket module
-
-This patch add support for the protocol family AF_CAN. It contains all the
-necessary code to use the python socket module for socketcan.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
----
- Lib/plat-linux2/IN.py | 2 +
- Modules/socketmodule.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++++
- Modules/socketmodule.h | 11 ++++++
- configure.in | 13 +++++++
- 4 files changed, 115 insertions(+)
-
-Index: b/Lib/plat-linux2/IN.py
-===================================================================
---- a/Lib/plat-linux2/IN.py
-+++ b/Lib/plat-linux2/IN.py
-@@ -384,6 +384,7 @@ PF_SNA = 22
- PF_IRDA = 23
- PF_PPPOX = 24
- PF_WANPIPE = 25
-+PF_CAN = 29
- PF_BLUETOOTH = 31
- PF_MAX = 32
- AF_UNSPEC = PF_UNSPEC
-@@ -414,6 +415,7 @@ AF_SNA = PF_SNA
- AF_IRDA = PF_IRDA
- AF_PPPOX = PF_PPPOX
- AF_WANPIPE = PF_WANPIPE
-+AF_CAN = PF_CAN
- AF_BLUETOOTH = PF_BLUETOOTH
- AF_MAX = PF_MAX
- SOL_RAW = 255
-Index: b/Modules/socketmodule.c
-===================================================================
---- a/Modules/socketmodule.c
-+++ b/Modules/socketmodule.c
-@@ -417,6 +417,10 @@ const char *inet_ntop(int af, const void
-
- #define SAS2SA(x) ((struct sockaddr *)(x))
-
-+#ifdef ENABLE_CAN
-+#include <linux/can/raw.h>
-+#endif
-+
- /*
- * Constants for getnameinfo()
- */
-@@ -1041,6 +1045,22 @@ makesockaddr(int sockfd, struct sockaddr
- }
- #endif
-
-+#ifdef ENABLE_CAN
-+ case AF_CAN:
-+ {
-+ struct sockaddr_can *a = (struct sockaddr_can *)addr;
-+ char *ifname = "";
-+ struct ifreq ifr;
-+ /* need to look up interface name give index */
-+ if (a->can_ifindex) {
-+ ifr.ifr_ifindex = a->can_ifindex;
-+ if (ioctl(sockfd, SIOCGIFNAME, &ifr) == 0)
-+ ifname = ifr.ifr_name;
-+ }
-+ return Py_BuildValue("s", ifname);
-+ }
-+#endif
-+
- #ifdef USE_BLUETOOTH
- case AF_BLUETOOTH:
- switch (proto) {
-@@ -1300,6 +1320,28 @@ getsockaddrarg(PySocketSockObject *s, Py
- }
- #endif
-
-+#ifdef ENABLE_CAN
-+ case AF_CAN:
-+ {
-+ struct sockaddr_can* addr;
-+ struct ifreq ifr;
-+ char *interfaceName;
-+ addr = (struct sockaddr_can*)addr_ret;
-+ if (!PyArg_Parse(args, "s", &interfaceName))
-+ return 0;
-+ strncpy(ifr.ifr_name, interfaceName, sizeof(ifr.ifr_name));
-+ ifr.ifr_name[(sizeof(ifr.ifr_name))-1] = '\0';
-+ if (ioctl(s->sock_fd, SIOCGIFINDEX, &ifr) < 0) {
-+ s->errorhandler();
-+ return 0;
-+ }
-+ addr->can_family = AF_CAN;
-+ addr->can_ifindex = ifr.ifr_ifindex;
-+ *len_ret = sizeof *addr;
-+ return 1;
-+ }
-+#endif
-+
- #ifdef USE_BLUETOOTH
- case AF_BLUETOOTH:
- {
-@@ -1530,6 +1572,14 @@ getsockaddrlen(PySocketSockObject *s, so
- }
- #endif
-
-+#ifdef ENABLE_CAN
-+ case AF_CAN:
-+ {
-+ *len_ret = sizeof (struct sockaddr_can);
-+ return 1;
-+ }
-+#endif
-+
- #ifdef USE_BLUETOOTH
- case AF_BLUETOOTH:
- {
-@@ -4559,6 +4609,10 @@ init_socket(void)
- PyModule_AddIntConstant(m, "AF_LLC", AF_LLC);
- #endif
-
-+#ifdef ENABLE_CAN
-+ PyModule_AddIntConstant(m, "AF_CAN", AF_CAN);
-+#endif
-+
- #ifdef USE_BLUETOOTH
- PyModule_AddIntConstant(m, "AF_BLUETOOTH", AF_BLUETOOTH);
- PyModule_AddIntConstant(m, "BTPROTO_L2CAP", BTPROTO_L2CAP);
-@@ -4892,6 +4946,41 @@ init_socket(void)
- PyModule_AddIntConstant(m, "IPPROTO_MAX", IPPROTO_MAX);
- #endif
-
-+#ifdef CAN_RAW
-+ PyModule_AddIntConstant(m, "CAN_RAW", CAN_RAW);
-+#endif
-+#ifdef CAN_BCM
-+ PyModule_AddIntConstant(m, "CAN_BCM", CAN_BCM);
-+#endif
-+#ifdef CAN_TP16
-+ PyModule_AddIntConstant(m, "CAN_TP16", CAN_TP16);
-+#endif
-+#ifdef CAN_TP20
-+ PyModule_AddIntConstant(m, "CAN_TP20", CAN_TP20);
-+#endif
-+#ifdef CAN_MCNET
-+ PyModule_AddIntConstant(m, "CAN_MCNET", CAN_MCNET);
-+#endif
-+#ifdef CAN_ISOTP
-+ PyModule_AddIntConstant(m, "CAN_ISOTP", CAN_ISOTP);
-+#endif
-+#ifdef CAN_NPROTO
-+ PyModule_AddIntConstant(m, "CAN_NPROTO", CAN_NPROTO);
-+#endif
-+
-+#ifdef SOL_CAN_BASE
-+ PyModule_AddIntConstant(m, "SOL_CAN_BASE", SOL_CAN_BASE);
-+#endif
-+#ifdef SOL_CAN_RAW
-+ PyModule_AddIntConstant(m, "SOL_CAN_RAW", SOL_CAN_RAW);
-+#endif
-+#ifdef ENABLE_CAN
-+ PyModule_AddIntConstant(m, "CAN_RAW_FILTER", CAN_RAW_FILTER);
-+ PyModule_AddIntConstant(m, "CAN_RAW_ERR_FILTER", CAN_RAW_ERR_FILTER);
-+ PyModule_AddIntConstant(m, "CAN_RAW_LOOPBACK", CAN_RAW_LOOPBACK);
-+ PyModule_AddIntConstant(m, "CAN_RAW_RECV_OWN_MSGS", CAN_RAW_RECV_OWN_MSGS);
-+#endif
-+
- /* Some port configuration */
- #ifdef IPPORT_RESERVED
- PyModule_AddIntConstant(m, "IPPORT_RESERVED", IPPORT_RESERVED);
-Index: b/Modules/socketmodule.h
-===================================================================
---- a/Modules/socketmodule.h
-+++ b/Modules/socketmodule.h
-@@ -55,6 +55,14 @@ typedef int socklen_t;
- #include <bluetooth/hci.h>
- #endif
-
-+#define AF_CAN 29
-+#define PF_CAN AF_CAN
-+
-+#ifdef HAVE_LINUX_CAN_H
-+#define ENABLE_CAN 1
-+#include <linux/can.h>
-+#endif
-+
- #ifdef HAVE_BLUETOOTH_H
- #include <bluetooth.h>
- #endif
-@@ -105,6 +113,9 @@ typedef union sock_addr {
- struct sockaddr_in6 in6;
- struct sockaddr_storage storage;
- #endif
-+#ifdef ENABLE_CAN
-+ struct sockaddr_can can;
-+#endif
- #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
- struct sockaddr_l2 bt_l2;
- struct sockaddr_rc bt_rc;
-Index: b/configure.in
-===================================================================
---- a/configure.in
-+++ b/configure.in
-@@ -1261,6 +1261,19 @@ AC_CHECK_HEADERS(linux/netlink.h,,,[
- #endif
- ])
-
-+AC_CHECK_HEADERS(linux/can.h,[],[],[#include <sys/socket.h>])
-+# check for AF_CAN
-+AC_TRY_COMPILE(
-+ [[#include <sys/socket.h>
-+ int domain = AF_CAN;]],
-+ [[socket(domain, 0, 0);]],
-+ [],
-+ [
-+ AC_DEFINE(AF_CAN, 29, [Define AF_CAN if not defined by sys/socket.h])
-+ AC_DEFINE(PF_CAN, 29, [Define PF_CAN if not defined by sys/socket.h])
-+ ]
-+)
-+
- # checks for typedefs
- was_it_defined=no
- AC_MSG_CHECKING(for clock_t in time.h)
diff --git a/patches/Python-2.6.4/0002--configure.in-chflags.patch b/patches/Python-2.6.4/0002--configure.in-chflags.patch
deleted file mode 100644
index 5ce949bfa..000000000
--- a/patches/Python-2.6.4/0002--configure.in-chflags.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 2448ad009249f2b6f64e9348c159add474699619 Mon Sep 17 00:00:00 2001
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Date: Thu, 23 Apr 2009 00:51:28 +0200
-Subject: [PATCH] [configure.in] chflags
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
----
- configure.in | 25 ++++++++++++++++++++-----
- 1 files changed, 20 insertions(+), 5 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 311311b..9e7b045 100644
---- a/configure.in
-+++ b/configure.in
-@@ -2581,7 +2581,8 @@ AC_CHECK_LIB(c, inet_aton, [$ac_cv_prog_TRUE],
- # On Tru64, chflags seems to be present, but calling it will
- # exit Python
- AC_MSG_CHECKING(for chflags)
--AC_TRY_RUN([
-+AC_CACHE_VAL([ac_cv_have_chflags],[
-+ AC_RUN_IFELSE([
- #include <sys/stat.h>
- #include <unistd.h>
- int main(int argc, char*argv[])
-@@ -2590,10 +2591,24 @@ int main(int argc, char*argv[])
- return 1;
- return 0;
- }
--],AC_DEFINE(HAVE_CHFLAGS, 1, Define to 1 if you have the `chflags' function.)
-- AC_MSG_RESULT(yes),
-- AC_MSG_RESULT(no)
--)
-+ ],
-+ [ac_cv_have_chflags=yes],
-+ [ac_cv_have_chflags=no],
-+ [ac_cv_have_chflags=cross]
-+)])
-+
-+case "${ac_cv_have_chflags}" in
-+yes)
-+ AC_MSG_RESULT([yes])
-+ AC_DEFINE(HAVE_CHFLAGS, 1, Define to 1 if you have the `chflags' function.)
-+ ;;
-+no)
-+ AC_MSG_RESULT([no])
-+ ;;
-+*)
-+ AC_MSG_ERROR([cross compiling - please set ac_cv_have_chflags to yes or no])
-+ ;;
-+esac
-
- AC_MSG_CHECKING(for lchflags)
- AC_TRY_RUN([
---
-1.5.6.3
-
diff --git a/patches/Python-2.6.4/0003--configure.in-lchflags.patch b/patches/Python-2.6.4/0003--configure.in-lchflags.patch
deleted file mode 100644
index f846dfd43..000000000
--- a/patches/Python-2.6.4/0003--configure.in-lchflags.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 6ab5d664a0daaa2ec34ab3f468523ec5262b03fc Mon Sep 17 00:00:00 2001
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Date: Thu, 23 Apr 2009 01:05:23 +0200
-Subject: [PATCH] [configure.in] lchflags
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
----
- configure.in | 25 ++++++++++++++++++++-----
- 1 files changed, 20 insertions(+), 5 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 9e7b045..0af62ae 100644
---- a/configure.in
-+++ b/configure.in
-@@ -2611,7 +2611,8 @@ no)
- esac
-
- AC_MSG_CHECKING(for lchflags)
--AC_TRY_RUN([
-+AC_CACHE_VAL([ac_cv_have_lchflags],[
-+ AC_RUN_IFELSE([
- #include <sys/stat.h>
- #include <unistd.h>
- int main(int argc, char*argv[])
-@@ -2620,10 +2621,24 @@ int main(int argc, char*argv[])
- return 1;
- return 0;
- }
--],AC_DEFINE(HAVE_LCHFLAGS, 1, Define to 1 if you have the `lchflags' function.)
-- AC_MSG_RESULT(yes),
-- AC_MSG_RESULT(no)
--)
-+ ],
-+ [ac_cv_have_lchflags=yes],
-+ [ac_cv_have_lchflags=no],
-+ [ac_cv_have_lchflags=cross]
-+)])
-+
-+case "${ac_cv_have_lchflags}" in
-+yes)
-+ AC_MSG_RESULT([yes])
-+ AC_DEFINE(HAVE_LCHFLAGS, 1, Define to 1 if you have the `lchflags' function.)
-+ ;;
-+no)
-+ AC_MSG_RESULT([no])
-+ ;;
-+*)
-+ AC_MSG_ERROR([cross compiling - please set ac_cv_have_lchflags to yes or no])
-+ ;;
-+esac
-
- dnl Check if system zlib has *Copy() functions
- dnl
---
-1.5.6.3
-
diff --git a/patches/Python-2.6.4/series b/patches/Python-2.6.4/series
deleted file mode 100644
index 1a7563d50..000000000
--- a/patches/Python-2.6.4/series
+++ /dev/null
@@ -1,19 +0,0 @@
-0001-Add-support-for-socketcan-to-the-python-socket-modul.patch
-0002--configure.in-chflags.patch
-0003--configure.in-lchflags.patch
-0004--configure.in-printf-format-zd.patch
-0005-use-AC_COMPILE_IFELSE-rather-than-AC_TRY_RUN.patch
-0006-use-AC_CHECK_SIZEOF-rather-than-AC_TRY_COMPILE-for-l.patch
-0007-use-AC_TYPE_LONG_DOUBLE-to-detect-long-double-suppor.patch
-0008-use-AC_CHECK_SIZEOF-rather-than-handcrafted-test-wit.patch
-0009-fix-silent-flag.patch
-0010-use-PGEN_FOR_BUILD.patch
-0011-introduce-and-use-PYTHON_FOR_BUILD.patch
-0012-distutils-introduce-and-use-EXECUTABLE_DIRNAME.patch
-0013-setup.py-don-t-leak-host-path-into-cross-compilatio.patch
-0014-setup.py-skip-import-check-while-cross-compiling.patch
-0015-add-cross-compilation-support.patch
-0016-provide-wrapper-for-cross-python.patch
-0017-fix-for-new-autoconf.diff
-0018-dont-add-rpaths.diff
-0019-assume-non-buggy-getaddrinfo-when-cross-compiling.patch
diff --git a/patches/Python-2.6.6/0001-Add-support-for-socketcan-to-the-python-socket-modul.patch b/patches/Python-2.6.6/0001-Add-support-for-socketcan-to-the-python-socket-modul.patch
new file mode 100644
index 000000000..899d509e8
--- /dev/null
+++ b/patches/Python-2.6.6/0001-Add-support-for-socketcan-to-the-python-socket-modul.patch
@@ -0,0 +1,227 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Tue, 5 May 2009 15:17:20 +0200
+Subject: [PATCH] Add support for socketcan to the python socket module
+
+This patch add support for the protocol family AF_CAN. It contains all the
+necessary code to use the python socket module for socketcan.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+---
+ Lib/plat-linux2/IN.py | 2 +
+ Modules/socketmodule.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++
+ Modules/socketmodule.h | 11 ++++++
+ configure.in | 13 +++++++
+ 4 files changed, 115 insertions(+), 0 deletions(-)
+
+diff --git a/Lib/plat-linux2/IN.py b/Lib/plat-linux2/IN.py
+index ad307f6..f72ae88 100644
+--- a/Lib/plat-linux2/IN.py
++++ b/Lib/plat-linux2/IN.py
+@@ -384,6 +384,7 @@ PF_SNA = 22
+ PF_IRDA = 23
+ PF_PPPOX = 24
+ PF_WANPIPE = 25
++PF_CAN = 29
+ PF_BLUETOOTH = 31
+ PF_MAX = 32
+ AF_UNSPEC = PF_UNSPEC
+@@ -414,6 +415,7 @@ AF_SNA = PF_SNA
+ AF_IRDA = PF_IRDA
+ AF_PPPOX = PF_PPPOX
+ AF_WANPIPE = PF_WANPIPE
++AF_CAN = PF_CAN
+ AF_BLUETOOTH = PF_BLUETOOTH
+ AF_MAX = PF_MAX
+ SOL_RAW = 255
+diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
+index a28116c..8b3625d 100644
+--- a/Modules/socketmodule.c
++++ b/Modules/socketmodule.c
+@@ -417,6 +417,10 @@ const char *inet_ntop(int af, const void *src, char *dst, socklen_t size);
+
+ #define SAS2SA(x) ((struct sockaddr *)(x))
+
++#ifdef ENABLE_CAN
++#include <linux/can/raw.h>
++#endif
++
+ /*
+ * Constants for getnameinfo()
+ */
+@@ -1041,6 +1045,22 @@ makesockaddr(int sockfd, struct sockaddr *addr, int addrlen, int proto)
+ }
+ #endif
+
++#ifdef ENABLE_CAN
++ case AF_CAN:
++ {
++ struct sockaddr_can *a = (struct sockaddr_can *)addr;
++ char *ifname = "";
++ struct ifreq ifr;
++ /* need to look up interface name give index */
++ if (a->can_ifindex) {
++ ifr.ifr_ifindex = a->can_ifindex;
++ if (ioctl(sockfd, SIOCGIFNAME, &ifr) == 0)
++ ifname = ifr.ifr_name;
++ }
++ return Py_BuildValue("s", ifname);
++ }
++#endif
++
+ #ifdef USE_BLUETOOTH
+ case AF_BLUETOOTH:
+ switch (proto) {
+@@ -1304,6 +1324,28 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
+ }
+ #endif
+
++#ifdef ENABLE_CAN
++ case AF_CAN:
++ {
++ struct sockaddr_can* addr;
++ struct ifreq ifr;
++ char *interfaceName;
++ addr = (struct sockaddr_can*)addr_ret;
++ if (!PyArg_Parse(args, "s", &interfaceName))
++ return 0;
++ strncpy(ifr.ifr_name, interfaceName, sizeof(ifr.ifr_name));
++ ifr.ifr_name[(sizeof(ifr.ifr_name))-1] = '\0';
++ if (ioctl(s->sock_fd, SIOCGIFINDEX, &ifr) < 0) {
++ s->errorhandler();
++ return 0;
++ }
++ addr->can_family = AF_CAN;
++ addr->can_ifindex = ifr.ifr_ifindex;
++ *len_ret = sizeof *addr;
++ return 1;
++ }
++#endif
++
+ #ifdef USE_BLUETOOTH
+ case AF_BLUETOOTH:
+ {
+@@ -1535,6 +1577,14 @@ getsockaddrlen(PySocketSockObject *s, socklen_t *len_ret)
+ }
+ #endif
+
++#ifdef ENABLE_CAN
++ case AF_CAN:
++ {
++ *len_ret = sizeof (struct sockaddr_can);
++ return 1;
++ }
++#endif
++
+ #ifdef USE_BLUETOOTH
+ case AF_BLUETOOTH:
+ {
+@@ -4583,6 +4633,10 @@ init_socket(void)
+ PyModule_AddIntConstant(m, "AF_LLC", AF_LLC);
+ #endif
+
++#ifdef ENABLE_CAN
++ PyModule_AddIntConstant(m, "AF_CAN", AF_CAN);
++#endif
++
+ #ifdef USE_BLUETOOTH
+ PyModule_AddIntConstant(m, "AF_BLUETOOTH", AF_BLUETOOTH);
+ PyModule_AddIntConstant(m, "BTPROTO_L2CAP", BTPROTO_L2CAP);
+@@ -4916,6 +4970,41 @@ init_socket(void)
+ PyModule_AddIntConstant(m, "IPPROTO_MAX", IPPROTO_MAX);
+ #endif
+
++#ifdef CAN_RAW
++ PyModule_AddIntConstant(m, "CAN_RAW", CAN_RAW);
++#endif
++#ifdef CAN_BCM
++ PyModule_AddIntConstant(m, "CAN_BCM", CAN_BCM);
++#endif
++#ifdef CAN_TP16
++ PyModule_AddIntConstant(m, "CAN_TP16", CAN_TP16);
++#endif
++#ifdef CAN_TP20
++ PyModule_AddIntConstant(m, "CAN_TP20", CAN_TP20);
++#endif
++#ifdef CAN_MCNET
++ PyModule_AddIntConstant(m, "CAN_MCNET", CAN_MCNET);
++#endif
++#ifdef CAN_ISOTP
++ PyModule_AddIntConstant(m, "CAN_ISOTP", CAN_ISOTP);
++#endif
++#ifdef CAN_NPROTO
++ PyModule_AddIntConstant(m, "CAN_NPROTO", CAN_NPROTO);
++#endif
++
++#ifdef SOL_CAN_BASE
++ PyModule_AddIntConstant(m, "SOL_CAN_BASE", SOL_CAN_BASE);
++#endif
++#ifdef SOL_CAN_RAW
++ PyModule_AddIntConstant(m, "SOL_CAN_RAW", SOL_CAN_RAW);
++#endif
++#ifdef ENABLE_CAN
++ PyModule_AddIntConstant(m, "CAN_RAW_FILTER", CAN_RAW_FILTER);
++ PyModule_AddIntConstant(m, "CAN_RAW_ERR_FILTER", CAN_RAW_ERR_FILTER);
++ PyModule_AddIntConstant(m, "CAN_RAW_LOOPBACK", CAN_RAW_LOOPBACK);
++ PyModule_AddIntConstant(m, "CAN_RAW_RECV_OWN_MSGS", CAN_RAW_RECV_OWN_MSGS);
++#endif
++
+ /* Some port configuration */
+ #ifdef IPPORT_RESERVED
+ PyModule_AddIntConstant(m, "IPPORT_RESERVED", IPPORT_RESERVED);
+diff --git a/Modules/socketmodule.h b/Modules/socketmodule.h
+index 9b85773..f0d8265 100644
+--- a/Modules/socketmodule.h
++++ b/Modules/socketmodule.h
+@@ -55,6 +55,14 @@ typedef int socklen_t;
+ #include <bluetooth/hci.h>
+ #endif
+
++#define AF_CAN 29
++#define PF_CAN AF_CAN
++
++#ifdef HAVE_LINUX_CAN_H
++#define ENABLE_CAN 1
++#include <linux/can.h>
++#endif
++
+ #ifdef HAVE_BLUETOOTH_H
+ #include <bluetooth.h>
+ #endif
+@@ -105,6 +113,9 @@ typedef union sock_addr {
+ struct sockaddr_in6 in6;
+ struct sockaddr_storage storage;
+ #endif
++#ifdef ENABLE_CAN
++ struct sockaddr_can can;
++#endif
+ #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+ struct sockaddr_l2 bt_l2;
+ struct sockaddr_rc bt_rc;
+diff --git a/configure.in b/configure.in
+index a3b96ae..e9b5cf0 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1350,6 +1350,19 @@ AC_CHECK_HEADERS(linux/netlink.h,,,[
+ #endif
+ ])
+
++AC_CHECK_HEADERS(linux/can.h,[],[],[#include <sys/socket.h>])
++# check for AF_CAN
++AC_TRY_COMPILE(
++ [[#include <sys/socket.h>
++ int domain = AF_CAN;]],
++ [[socket(domain, 0, 0);]],
++ [],
++ [
++ AC_DEFINE(AF_CAN, 29, [Define AF_CAN if not defined by sys/socket.h])
++ AC_DEFINE(PF_CAN, 29, [Define PF_CAN if not defined by sys/socket.h])
++ ]
++)
++
+ # checks for typedefs
+ was_it_defined=no
+ AC_MSG_CHECKING(for clock_t in time.h)
+--
+1.7.2.3
+
diff --git a/patches/Python-2.6.4/0004--configure.in-printf-format-zd.patch b/patches/Python-2.6.6/0002-printf-format-zd.patch
index 5b2d5533c..7c8ce8ef3 100644
--- a/patches/Python-2.6.4/0004--configure.in-printf-format-zd.patch
+++ b/patches/Python-2.6.6/0002-printf-format-zd.patch
@@ -1,7 +1,6 @@
-From 44a7b5cd5bca0d11b785d917a842d6436f6ad19f Mon Sep 17 00:00:00 2001
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Thu, 23 Apr 2009 08:49:08 +0200
-Subject: [PATCH] [configure.in] printf format %zd
+Subject: [PATCH] printf format %zd
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
@@ -9,10 +8,10 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/configure.in b/configure.in
-index 0af62ae..b86ee74 100644
+index e9b5cf0..87fad98 100644
--- a/configure.in
+++ b/configure.in
-@@ -3700,7 +3700,8 @@ else
+@@ -3874,7 +3874,8 @@ else
fi
AC_MSG_CHECKING(for %zd printf() format support)
@@ -22,7 +21,7 @@ index 0af62ae..b86ee74 100644
#include <stddef.h>
#include <string.h>
-@@ -3734,9 +3735,23 @@ int main()
+@@ -3908,9 +3909,23 @@ int main()
return 0;
}],
@@ -50,5 +49,5 @@ index 0af62ae..b86ee74 100644
AC_CHECK_TYPE(socklen_t,,
AC_DEFINE(socklen_t,int,
--
-1.5.6.3
+1.7.2.3
diff --git a/patches/Python-2.6.4/0005-use-AC_COMPILE_IFELSE-rather-than-AC_TRY_RUN.patch b/patches/Python-2.6.6/0003-use-AC_COMPILE_IFELSE-rather-than-AC_TRY_RUN.patch
index d760c76d6..3d8ffe581 100644
--- a/patches/Python-2.6.4/0005-use-AC_COMPILE_IFELSE-rather-than-AC_TRY_RUN.patch
+++ b/patches/Python-2.6.6/0003-use-AC_COMPILE_IFELSE-rather-than-AC_TRY_RUN.patch
@@ -1,4 +1,3 @@
-From b03b879f2f107c3f0e55720b31fc87fb02ec2884 Mon Sep 17 00:00:00 2001
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Fri, 24 Apr 2009 18:35:19 +0200
Subject: [PATCH] use AC_COMPILE_IFELSE rather than AC_TRY_RUN
@@ -23,10 +22,10 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/configure.in b/configure.in
-index b86ee74..e86b2ba 100644
+index 87fad98..8d130b4 100644
--- a/configure.in
+++ b/configure.in
-@@ -658,9 +658,8 @@ AC_ARG_ENABLE(profiling,
+@@ -697,9 +697,8 @@ AC_ARG_ENABLE(profiling,
AC_HELP_STRING(--enable-profiling, enable C-level code profiling),
[ac_save_cc="$CC"
CC="$CC -pg"
@@ -37,7 +36,7 @@ index b86ee74..e86b2ba 100644
ac_enable_profiling="no")
CC="$ac_save_cc"])
AC_MSG_RESULT($ac_enable_profiling)
-@@ -883,9 +882,8 @@ yes)
+@@ -922,9 +921,8 @@ yes)
AC_MSG_CHECKING(whether $CC accepts -fno-strict-aliasing)
ac_save_cc="$CC"
CC="$CC -fno-strict-aliasing"
@@ -48,7 +47,7 @@ index b86ee74..e86b2ba 100644
ac_cv_no_strict_aliasing_ok=no)
CC="$ac_save_cc"
AC_MSG_RESULT($ac_cv_no_strict_aliasing_ok)
-@@ -1004,9 +1002,8 @@ AC_MSG_CHECKING(whether $CC accepts -OPT:Olimit=0)
+@@ -1093,9 +1091,8 @@ AC_MSG_CHECKING(whether $CC accepts -OPT:Olimit=0)
AC_CACHE_VAL(ac_cv_opt_olimit_ok,
[ac_save_cc="$CC"
CC="$CC -OPT:Olimit=0"
@@ -59,7 +58,7 @@ index b86ee74..e86b2ba 100644
ac_cv_opt_olimit_ok=no)
CC="$ac_save_cc"])
AC_MSG_RESULT($ac_cv_opt_olimit_ok)
-@@ -1026,9 +1023,8 @@ else
+@@ -1115,9 +1112,8 @@ else
AC_CACHE_VAL(ac_cv_olimit_ok,
[ac_save_cc="$CC"
CC="$CC -Olimit 1500"
@@ -71,5 +70,5 @@ index b86ee74..e86b2ba 100644
CC="$ac_save_cc"])
AC_MSG_RESULT($ac_cv_olimit_ok)
--
-1.5.6.3
+1.7.2.3
diff --git a/patches/Python-2.6.4/0006-use-AC_CHECK_SIZEOF-rather-than-AC_TRY_COMPILE-for-l.patch b/patches/Python-2.6.6/0004-use-AC_CHECK_SIZEOF-rather-than-AC_TRY_COMPILE-for-l.patch
index 669046334..8183042af 100644
--- a/patches/Python-2.6.4/0006-use-AC_CHECK_SIZEOF-rather-than-AC_TRY_COMPILE-for-l.patch
+++ b/patches/Python-2.6.6/0004-use-AC_CHECK_SIZEOF-rather-than-AC_TRY_COMPILE-for-l.patch
@@ -1,4 +1,3 @@
-From ba932c009e8fc45e23efe1dfbc0f179c40af6923 Mon Sep 17 00:00:00 2001
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Fri, 24 Apr 2009 18:44:11 +0200
Subject: [PATCH] use AC_CHECK_SIZEOF rather than AC_TRY_COMPILE for long long detection
@@ -12,10 +11,10 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/configure.in b/configure.in
-index e86b2ba..9c5818a 100644
+index 8d130b4..c85e89b 100644
--- a/configure.in
+++ b/configure.in
-@@ -1359,15 +1359,9 @@ AC_CHECK_SIZEOF(fpos_t, 4)
+@@ -1455,15 +1455,9 @@ AC_CHECK_SIZEOF(fpos_t, 4)
AC_CHECK_SIZEOF(size_t, 4)
AC_CHECK_SIZEOF(pid_t, 4)
@@ -35,5 +34,5 @@ index e86b2ba..9c5818a 100644
AC_MSG_CHECKING(for long double support)
--
-1.5.6.3
+1.7.2.3
diff --git a/patches/Python-2.6.4/0007-use-AC_TYPE_LONG_DOUBLE-to-detect-long-double-suppor.patch b/patches/Python-2.6.6/0005-use-AC_TYPE_LONG_DOUBLE-to-detect-long-double-suppor.patch
index ced5ad87c..aaee6f129 100644
--- a/patches/Python-2.6.4/0007-use-AC_TYPE_LONG_DOUBLE-to-detect-long-double-suppor.patch
+++ b/patches/Python-2.6.6/0005-use-AC_TYPE_LONG_DOUBLE-to-detect-long-double-suppor.patch
@@ -1,4 +1,3 @@
-From e8684e66c22ce7463c86fb2c6b48451988769721 Mon Sep 17 00:00:00 2001
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Fri, 24 Apr 2009 18:47:19 +0200
Subject: [PATCH] use AC_TYPE_LONG_DOUBLE to detect long double support
@@ -12,10 +11,10 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
1 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/configure.in b/configure.in
-index 9c5818a..aac9bd2 100644
+index c85e89b..cb09bf7 100644
--- a/configure.in
+++ b/configure.in
-@@ -1364,16 +1364,8 @@ if test "$ac_cv_type_long_long" = "yes" ; then
+@@ -1460,16 +1460,8 @@ if test "$ac_cv_type_long_long" = "yes" ; then
AC_DEFINE(HAVE_LONG_LONG, 1, [Define this if you have the type long long.])
fi
@@ -35,5 +34,5 @@ index 9c5818a..aac9bd2 100644
AC_MSG_CHECKING(for _Bool support)
have_c99_bool=no
--
-1.5.6.3
+1.7.2.3
diff --git a/patches/Python-2.6.4/0008-use-AC_CHECK_SIZEOF-rather-than-handcrafted-test-wit.patch b/patches/Python-2.6.6/0006-use-AC_CHECK_SIZEOF-rather-than-handcrafted-test-wit.patch
index decda4680..a20aed59e 100644
--- a/patches/Python-2.6.4/0008-use-AC_CHECK_SIZEOF-rather-than-handcrafted-test-wit.patch
+++ b/patches/Python-2.6.6/0006-use-AC_CHECK_SIZEOF-rather-than-handcrafted-test-wit.patch
@@ -1,4 +1,3 @@
-From 648a7538c36f67696d88ee99ddccc2bc78a1ef75 Mon Sep 17 00:00:00 2001
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Fri, 24 Apr 2009 19:10:14 +0200
Subject: [PATCH] use AC_CHECK_SIZEOF rather than handcrafted test with AC_TRY_RUN
@@ -17,10 +16,10 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
1 files changed, 4 insertions(+), 54 deletions(-)
diff --git a/configure.in b/configure.in
-index aac9bd2..5135bd3 100644
+index cb09bf7..1066880 100644
--- a/configure.in
+++ b/configure.in
-@@ -1385,23 +1385,9 @@ AC_CHECK_TYPES(uintptr_t,
+@@ -1481,23 +1481,9 @@ AC_CHECK_TYPES(uintptr_t,
#endif])
@@ -45,7 +44,7 @@ index aac9bd2..5135bd3 100644
AC_DEFINE_UNQUOTED(SIZEOF_OFF_T, $ac_cv_sizeof_off_t,
[The number of bytes in an off_t.])
-@@ -1420,22 +1406,9 @@ else
+@@ -1520,22 +1506,9 @@ else
fi
# AC_CHECK_SIZEOF() doesn't include <time.h>.
@@ -69,7 +68,7 @@ index aac9bd2..5135bd3 100644
AC_DEFINE_UNQUOTED(SIZEOF_TIME_T, $ac_cv_sizeof_time_t,
[The number of bytes in a time_t.])
-@@ -1449,32 +1422,9 @@ then CC="$CC -Kthread"
+@@ -1549,32 +1522,9 @@ then CC="$CC -Kthread"
elif test "$ac_cv_pthread" = "yes"
then CC="$CC -pthread"
fi
@@ -105,5 +104,5 @@ index aac9bd2..5135bd3 100644
AC_MSG_CHECKING(for --enable-toolbox-glue)
AC_ARG_ENABLE(toolbox-glue,
--
-1.5.6.3
+1.7.2.3
diff --git a/patches/Python-2.6.4/0009-fix-silent-flag.patch b/patches/Python-2.6.6/0007-fix-silent-flag.patch
index 513d03a02..1927d98ec 100644
--- a/patches/Python-2.6.4/0009-fix-silent-flag.patch
+++ b/patches/Python-2.6.6/0007-fix-silent-flag.patch
@@ -1,4 +1,3 @@
-From 1833c8a1a14a9fbf99eac971532a6153cde6ba2f Mon Sep 17 00:00:00 2001
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Tue, 28 Apr 2009 13:08:35 +0200
Subject: [PATCH] fix silent flag
@@ -13,7 +12,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 5c5e29c..9ad9f08 100644
+index 0329d67..f8a8d36 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -393,8 +393,8 @@ platform: $(BUILDPYTHON)
@@ -21,12 +20,12 @@ index 5c5e29c..9ad9f08 100644
# Build the shared modules
sharedmods: $(BUILDPYTHON)
- @case $$MAKEFLAGS in \
-- *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
+- *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
+ @case "$(MAKEFLAGS)" in \
-+ s|*\ s|s\ *|*\ s\ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
- *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
++ s|*\ s|s\ *|*\ s\ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
+ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
esac
--
-1.5.6.3
+1.7.2.3
diff --git a/patches/Python-2.6.4/0010-use-PGEN_FOR_BUILD.patch b/patches/Python-2.6.6/0008-use-PGEN_FOR_BUILD.patch
index 41433a538..30ec4df0d 100644
--- a/patches/Python-2.6.4/0010-use-PGEN_FOR_BUILD.patch
+++ b/patches/Python-2.6.6/0008-use-PGEN_FOR_BUILD.patch
@@ -1,4 +1,3 @@
-From ea4ae1db79bf21899b70f10cd892077725f2f804 Mon Sep 17 00:00:00 2001
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Tue, 28 Apr 2009 14:05:30 +0200
Subject: [PATCH] use PGEN_FOR_BUILD
@@ -9,7 +8,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 9ad9f08..e847e2c 100644
+index f8a8d36..01d4c98 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -205,6 +205,7 @@ GRAMMAR_INPUT= $(srcdir)/Grammar/Grammar
@@ -33,5 +32,5 @@ index 9ad9f08..e847e2c 100644
$(PGEN): $(PGENOBJS)
$(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)
--
-1.5.6.3
+1.7.2.3
diff --git a/patches/Python-2.6.4/0011-introduce-and-use-PYTHON_FOR_BUILD.patch b/patches/Python-2.6.6/0009-introduce-and-use-PYTHON_FOR_BUILD.patch
index b0459040b..de89a98dd 100644
--- a/patches/Python-2.6.4/0011-introduce-and-use-PYTHON_FOR_BUILD.patch
+++ b/patches/Python-2.6.6/0009-introduce-and-use-PYTHON_FOR_BUILD.patch
@@ -1,4 +1,3 @@
-From f091c104cb02b0724e7ea13fb5062a788c37091c Mon Sep 17 00:00:00 2001
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Tue, 28 Apr 2009 14:22:01 +0200
Subject: [PATCH] introduce and use PYTHON_FOR_BUILD
@@ -15,7 +14,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2 files changed, 36 insertions(+), 19 deletions(-)
diff --git a/Makefile.pre.in b/Makefile.pre.in
-index e847e2c..8ad6e8b 100644
+index 01d4c98..4031505 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -174,7 +174,8 @@ LIBOBJS= @LIBOBJS@
@@ -51,10 +50,10 @@ index e847e2c..8ad6e8b 100644
-sharedmods: $(BUILDPYTHON)
+sharedmods: $(BUILDPYTHON) $(PYTHON_FOR_BUILD)
@case "$(MAKEFLAGS)" in \
-- s|*\ s|s\ *|*\ s\ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
-- *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
-+ s|*\ s|s\ *|*\ s\ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(PYTHON_FOR_BUILD) -E $(srcdir)/setup.py -q build;; \
-+ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(PYTHON_FOR_BUILD) -E $(srcdir)/setup.py build;; \
+- s|*\ s|s\ *|*\ s\ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
+- *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
++ s|*\ s|s\ *|*\ s\ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' $(PYTHON_FOR_BUILD) -E $(srcdir)/setup.py -q build;; \
++ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' $(PYTHON_FOR_BUILD) -E $(srcdir)/setup.py build;; \
esac
# Build static library
@@ -69,10 +68,10 @@ index e847e2c..8ad6e8b 100644
-$(TESTPYTHON) $(TESTPROG) $(TESTOPTS)
@@ -700,7 +701,7 @@ testuniversal: all platform
-find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
- -$(TESTPYTHON) $(TESTPROG) $(TESTOPTS) -uall
- $(TESTPYTHON) $(TESTPROG) $(TESTOPTS) -uall
-- $(RUNSHARED) /usr/libexec/oah/translate ./$(BUILDPYTHON) -E -tt $(TESTPROG) $(TESTOPTS) -uall
-+ $(RUNSHARED) /usr/libexec/oah/translate $(PYTHON_FOR_BUILD) -E -tt $(TESTPROG) $(TESTOPTS) -uall
+ -$(TESTPYTHON) $(TESTPROG) -uall $(TESTOPTS)
+ $(TESTPYTHON) $(TESTPROG) -uall $(TESTOPTS)
+- $(RUNSHARED) /usr/libexec/oah/translate ./$(BUILDPYTHON) -E -tt $(TESTPROG) -uall $(TESTOPTS)
++ $(RUNSHARED) /usr/libexec/oah/translate $(PYTHON_FOR_BUILD) -E -tt $(TESTPROG) -uall $(TESTOPTS)
# Like testall, but with a single pass only
@@ -123,7 +122,7 @@ index e847e2c..8ad6e8b 100644
$(LN) -fsn $(VERSION) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current
$(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/$(PYTHONFRAMEWORK)
$(LN) -fsn Versions/Current/Headers $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Headers
-@@ -1082,7 +1083,7 @@ frameworkinstallextras:
+@@ -1083,7 +1084,7 @@ frameworkinstallextras:
# This installs a few of the useful scripts in Tools/scripts
scriptsinstall:
SRCDIR=$(srcdir) $(RUNSHARED) \
@@ -132,7 +131,7 @@ index e847e2c..8ad6e8b 100644
--prefix=$(prefix) \
--install-scripts=$(BINDIR) \
--root=/$(DESTDIR)
-@@ -1104,7 +1105,7 @@ config.status: $(srcdir)/configure
+@@ -1105,7 +1106,7 @@ config.status: $(srcdir)/configure
# Run reindent on the library
reindent:
@@ -141,7 +140,7 @@ index e847e2c..8ad6e8b 100644
# Rerun configure with the same options as it was run last time,
# provided the config.status script exists
-@@ -1200,7 +1201,7 @@ funny:
+@@ -1203,7 +1204,7 @@ funny:
# Perform some verification checks on any modified files.
patchcheck:
@@ -151,10 +150,10 @@ index e847e2c..8ad6e8b 100644
# Dependencies
diff --git a/configure.in b/configure.in
-index 5135bd3..e65e530 100644
+index 1066880..52de250 100644
--- a/configure.in
+++ b/configure.in
-@@ -3713,6 +3713,22 @@ for dir in $SRCDIRS; do
+@@ -3894,6 +3894,22 @@ for dir in $SRCDIRS; do
done
AC_MSG_RESULT(done)
@@ -178,5 +177,5 @@ index 5135bd3..e65e530 100644
AC_CONFIG_FILES(Makefile.pre Modules/Setup.config)
AC_OUTPUT
--
-1.5.6.3
+1.7.2.3
diff --git a/patches/Python-2.6.4/0012-distutils-introduce-and-use-EXECUTABLE_DIRNAME.patch b/patches/Python-2.6.6/0010-distutils-introduce-and-use-EXECUTABLE_DIRNAME.patch
index 601aa952b..6ac90d245 100644
--- a/patches/Python-2.6.4/0012-distutils-introduce-and-use-EXECUTABLE_DIRNAME.patch
+++ b/patches/Python-2.6.6/0010-distutils-introduce-and-use-EXECUTABLE_DIRNAME.patch
@@ -1,9 +1,8 @@
-From 35b2f370694bb610118064ef0a6cc5a30fad4b70 Mon Sep 17 00:00:00 2001
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Tue, 28 Apr 2009 18:05:33 +0200
Subject: [PATCH] distutils: introduce and use EXECUTABLE_DIRNAME
-os.path.abspath(sys.executable) is used several times in
+os.path.realpath(sys.executable) is used several times in
distutils.sysconfig. This patch introduces the variable
EXECUTABLE_DIRNAME which holds this information.
@@ -12,53 +11,45 @@ scenario. (see later patch)
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
- Lib/distutils/sysconfig.py | 12 ++++++------
- 1 files changed, 6 insertions(+), 6 deletions(-)
+ Lib/distutils/sysconfig.py | 7 ++++---
+ 1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
-index 99c0e63..a00b2f9 100644
+index 350e48c..83af687 100644
--- a/Lib/distutils/sysconfig.py
+++ b/Lib/distutils/sysconfig.py
@@ -21,11 +21,12 @@ from distutils.errors import DistutilsPlatformError
# These are needed in a couple of spots, so just compute them once.
PREFIX = os.path.normpath(sys.prefix)
EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
-+EXECUTABLE_DIRNAME = os.path.dirname(os.path.abspath(sys.executable))
++EXECUTABLE_DIRNAME = os.path.dirname(os.path.realpath(sys.executable))
# Path to the base directory of the project. On Windows the binary may
# live in project/PCBuild9. If we're dealing with an x64 Windows build,
# it'll live in project/PCbuild/amd64.
--project_base = os.path.dirname(os.path.abspath(sys.executable))
+-project_base = os.path.dirname(os.path.realpath(sys.executable))
+project_base = EXECUTABLE_DIRNAME
if os.name == "nt" and "pcbuild" in project_base[-8:].lower():
project_base = os.path.abspath(os.path.join(project_base, os.path.pardir))
# PC/VS7.1
-@@ -73,13 +74,12 @@ def get_python_inc(plat_specific=0, prefix=None):
- prefix = plat_specific and EXEC_PREFIX or PREFIX
+@@ -74,7 +75,7 @@ def get_python_inc(plat_specific=0, prefix=None):
+
if os.name == "posix":
if python_build:
-- base = os.path.dirname(os.path.abspath(sys.executable))
+- buildir = os.path.dirname(os.path.realpath(sys.executable))
++ buildir = EXECUTABLE_DIRNAME
if plat_specific:
-- inc_dir = base
-+ inc_dir = EXECUTABLE_DIRNAME
- else:
-- inc_dir = os.path.join(base, "Include")
-+ inc_dir = os.path.join(EXECUTABLE_DIRNAME, "Include")
- if not os.path.exists(inc_dir):
-- inc_dir = os.path.join(os.path.dirname(base), "Include")
-+ inc_dir = os.path.join(os.path.dirname(EXECUTABLE_DIRNAME), "Include")
- return inc_dir
- return os.path.join(prefix, "include", "python" + get_python_version())
- elif os.name == "nt":
-@@ -218,7 +218,7 @@ def get_config_h_filename():
+ # python.h is located in the buildir
+ inc_dir = buildir
+@@ -222,7 +223,7 @@ def get_config_h_filename():
def get_makefile_filename():
"""Return full pathname of installed Makefile from the Python build."""
if python_build:
-- return os.path.join(os.path.dirname(sys.executable), "Makefile")
-+ return os.path.join(EXECUTABLE_DIRNAME, "Makefile")
+- return os.path.join(os.path.dirname(os.path.realpath(sys.executable)),
++ return os.path.join(EXECUTABLE_DIRNAME,
+ "Makefile")
lib_dir = get_python_lib(plat_specific=1, standard_lib=1)
return os.path.join(lib_dir, "config", "Makefile")
-
--
-1.5.6.3
+1.7.2.3
diff --git a/patches/Python-2.6.4/0013-setup.py-don-t-leak-host-path-into-cross-compilatio.patch b/patches/Python-2.6.6/0011-setup.py-don-t-leak-host-path-into-cross-compilation.patch
index 01f47b533..8788de6f4 100644
--- a/patches/Python-2.6.4/0013-setup.py-don-t-leak-host-path-into-cross-compilatio.patch
+++ b/patches/Python-2.6.6/0011-setup.py-don-t-leak-host-path-into-cross-compilation.patch
@@ -1,4 +1,3 @@
-From 2733013612e513e4756fafd82f33f66f7f7036f3 Mon Sep 17 00:00:00 2001
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Tue, 28 Apr 2009 19:07:54 +0200
Subject: [PATCH] setup.py: don't leak host path into cross compilation environment
@@ -12,10 +11,10 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
1 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/setup.py b/setup.py
-index 9c71947..eacbbd8 100644
+index 6e02114..08208bd 100644
--- a/setup.py
+++ b/setup.py
-@@ -310,8 +310,10 @@ class PyBuildExt(build_ext):
+@@ -356,8 +356,10 @@ class PyBuildExt(build_ext):
def detect_modules(self):
# Ensure that /usr/local is always used
@@ -28,7 +27,7 @@ index 9c71947..eacbbd8 100644
# Add paths specified in the environment variables LDFLAGS and
# CPPFLAGS for header and library files.
-@@ -325,6 +327,10 @@ class PyBuildExt(build_ext):
+@@ -371,6 +373,10 @@ class PyBuildExt(build_ext):
('CPPFLAGS', '-I', self.compiler.include_dirs)):
env_val = sysconfig.get_config_var(env_var)
if env_val:
@@ -39,7 +38,7 @@ index 9c71947..eacbbd8 100644
# To prevent optparse from raising an exception about any
# options in env_val that it doesn't know about we strip out
# all double dashes and any dashes followed by a character
-@@ -361,11 +367,18 @@ class PyBuildExt(build_ext):
+@@ -407,11 +413,18 @@ class PyBuildExt(build_ext):
# lib_dirs and inc_dirs are used to search for files;
# if a file is found in one of those directories, it can
# be assumed that no additional -I,-L directives are needed.
@@ -63,7 +62,7 @@ index 9c71947..eacbbd8 100644
exts = []
missing = []
-@@ -769,6 +782,9 @@ class PyBuildExt(build_ext):
+@@ -846,6 +859,9 @@ class PyBuildExt(build_ext):
db_inc_paths.append('/pkg/db-3.%d/include' % x)
db_inc_paths.append('/opt/db-3.%d/include' % x)
@@ -73,7 +72,7 @@ index 9c71947..eacbbd8 100644
# Add some common subdirectories for Sleepycat DB to the list,
# based on the standard include directories. This way DB3/4 gets
# picked up when it is installed in a non-standard prefix and
-@@ -900,6 +916,9 @@ class PyBuildExt(build_ext):
+@@ -998,6 +1014,9 @@ class PyBuildExt(build_ext):
MIN_SQLITE_VERSION = ".".join([str(x)
for x in MIN_SQLITE_VERSION_NUMBER])
@@ -83,16 +82,16 @@ index 9c71947..eacbbd8 100644
# Scan the default include directories before the SQLite specific
# ones. This allows one to override the copy of sqlite on OSX,
# where /usr/include contains an old version of sqlite.
-@@ -990,6 +1009,9 @@ class PyBuildExt(build_ext):
+@@ -1095,6 +1114,9 @@ class PyBuildExt(build_ext):
# the more recent berkeleydb's db.h file first in the include path
# when attempting to compile and it will fail.
f = "/usr/include/db.h"
+ if os.environ.get('CROSS_COMPILING') == 'yes':
+ f = ''
+
- if os.path.exists(f) and not db_incs:
- data = open(f).read()
- m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data)
+
+ if sys.platform == 'darwin':
+ if is_macosx_sdk_path(f):
--
-1.5.6.3
+1.7.2.3
diff --git a/patches/Python-2.6.4/0014-setup.py-skip-import-check-while-cross-compiling.patch b/patches/Python-2.6.6/0012-setup.py-skip-import-check-while-cross-compiling.patch
index e99ad7a73..5f50b1f95 100644
--- a/patches/Python-2.6.4/0014-setup.py-skip-import-check-while-cross-compiling.patch
+++ b/patches/Python-2.6.6/0012-setup.py-skip-import-check-while-cross-compiling.patch
@@ -1,4 +1,3 @@
-From ffb8d658042e698dced9be6fece1bcf3f5b62f68 Mon Sep 17 00:00:00 2001
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Tue, 28 Apr 2009 19:08:19 +0200
Subject: [PATCH] setup.py: skip import check while cross compiling
@@ -12,10 +11,10 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/setup.py b/setup.py
-index eacbbd8..7beb08b 100644
+index 08208bd..01b0ffc 100644
--- a/setup.py
+++ b/setup.py
-@@ -267,6 +267,10 @@ class PyBuildExt(build_ext):
+@@ -313,6 +313,10 @@ class PyBuildExt(build_ext):
self.announce('WARNING: skipping import check for Cygwin-based "%s"'
% ext.name)
return
@@ -27,5 +26,5 @@ index eacbbd8..7beb08b 100644
self.build_lib,
self.get_ext_filename(self.get_ext_fullname(ext.name)))
--
-1.5.6.3
+1.7.2.3
diff --git a/patches/Python-2.6.4/0015-add-cross-compilation-support.patch b/patches/Python-2.6.6/0013-add-cross-compilation-support.patch
index 9b408a5f8..985df6489 100644
--- a/patches/Python-2.6.4/0015-add-cross-compilation-support.patch
+++ b/patches/Python-2.6.6/0013-add-cross-compilation-support.patch
@@ -1,4 +1,3 @@
-From 430893ea1bad2245f00d44fef62bbfb75db27f96 Mon Sep 17 00:00:00 2001
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Mon, 4 May 2009 14:39:18 +0200
Subject: [PATCH] add cross compilation support
@@ -14,7 +13,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
4 files changed, 50 insertions(+), 10 deletions(-)
diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
-index a00b2f9..b1091da 100644
+index 83af687..f583381 100644
--- a/Lib/distutils/sysconfig.py
+++ b/Lib/distutils/sysconfig.py
@@ -19,9 +19,16 @@ import sys
@@ -23,7 +22,7 @@ index a00b2f9..b1091da 100644
# These are needed in a couple of spots, so just compute them once.
-PREFIX = os.path.normpath(sys.prefix)
-EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
- EXECUTABLE_DIRNAME = os.path.dirname(os.path.abspath(sys.executable))
+ EXECUTABLE_DIRNAME = os.path.dirname(os.path.realpath(sys.executable))
+if os.environ.get('CROSS_COMPILING') == 'yes':
+ _sysroot=os.environ.get('_python_sysroot')
+ PREFIX = os.path.normpath(_sysroot + os.environ.get('_python_prefix'))
@@ -37,7 +36,7 @@ index a00b2f9..b1091da 100644
# Path to the base directory of the project. On Windows the binary may
# live in project/PCBuild9. If we're dealing with an x64 Windows build,
diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 8ad6e8b..795b67d 100644
+index 4031505..2bc3f38 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -72,6 +72,10 @@ CFLAGSFORSHARED=@CFLAGSFORSHARED@
@@ -54,9 +53,9 @@ index 8ad6e8b..795b67d 100644
@@ -87,11 +91,11 @@ datarootdir= @datarootdir@
# Expanded directories
- BINDIR= $(exec_prefix)/bin
--LIBDIR= $(exec_prefix)/lib
-+LIBDIR= $(sysroot)$(exec_prefix)/lib
+ BINDIR= @bindir@
+-LIBDIR= @libdir@
++LIBDIR= $(sysroot)@libdir@
MANDIR= @mandir@
-INCLUDEDIR= @includedir@
-CONFINCLUDEDIR= $(exec_prefix)/include
@@ -68,7 +67,7 @@ index 8ad6e8b..795b67d 100644
# Detailed destination directories
BINLIBDEST= $(LIBDIR)/python$(VERSION)
diff --git a/configure.in b/configure.in
-index e65e530..1354b7f 100644
+index 52de250..88462b3 100644
--- a/configure.in
+++ b/configure.in
@@ -12,6 +12,9 @@ AC_INIT(python, PYTHON_VERSION, http://www.python.org/python-bugs)
@@ -81,7 +80,7 @@ index e65e530..1354b7f 100644
dnl This is for stuff that absolutely must end up in pyconfig.h.
dnl Please use pyport.h instead, if possible.
AH_TOP([
-@@ -756,9 +759,9 @@ fi
+@@ -795,9 +798,9 @@ fi
AC_MSG_RESULT($LDLIBRARY)
@@ -94,7 +93,7 @@ index e65e530..1354b7f 100644
AC_SUBST(SVNVERSION)
AC_CHECK_PROG(SVNVERSION, svnversion, found, not-found)
-@@ -3729,6 +3732,28 @@ AC_SUBST(PYTHON_FOR_BUILD)
+@@ -3910,6 +3913,28 @@ AC_SUBST(PYTHON_FOR_BUILD)
AC_ARG_VAR(PYTHON_FOR_BUILD,[build system python (default: python)])
@@ -124,10 +123,10 @@ index e65e530..1354b7f 100644
AC_CONFIG_FILES(Makefile.pre Modules/Setup.config)
AC_OUTPUT
diff --git a/setup.py b/setup.py
-index 7beb08b..2c183c4 100644
+index 01b0ffc..d3aac1b 100644
--- a/setup.py
+++ b/setup.py
-@@ -1715,7 +1715,11 @@ class PyBuildExt(build_ext):
+@@ -1849,7 +1849,11 @@ class PyBuildExt(build_ext):
ffi_configfile):
from distutils.dir_util import mkpath
mkpath(ffi_builddir)
@@ -141,5 +140,5 @@ index 7beb08b..2c183c4 100644
# Pass empty CFLAGS because we'll just append the resulting
# CFLAGS to Python's; -g or -O2 is to be avoided.
--
-1.5.6.3
+1.7.2.3
diff --git a/patches/Python-2.6.4/0016-provide-wrapper-for-cross-python.patch b/patches/Python-2.6.6/0014-provide-wrapper-for-cross-python.patch
index 2c8db34d3..614a83be2 100644
--- a/patches/Python-2.6.4/0016-provide-wrapper-for-cross-python.patch
+++ b/patches/Python-2.6.6/0014-provide-wrapper-for-cross-python.patch
@@ -1,4 +1,3 @@
-From ff60f7c08cb167d060fd0e34b543550facf846c6 Mon Sep 17 00:00:00 2001
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Mon, 4 May 2009 21:45:37 +0200
Subject: [PATCH] provide wrapper for cross-python
@@ -11,13 +10,13 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
configure.in | 2 +-
cross-python-wrapper.in | 13 +++++++++++++
2 files changed, 14 insertions(+), 1 deletions(-)
- create mode 100755 cross-python-wrapper.in
+ create mode 100644 cross-python-wrapper.in
diff --git a/configure.in b/configure.in
-index 1354b7f..7beda7d 100644
+index 88462b3..9b80a5d 100644
--- a/configure.in
+++ b/configure.in
-@@ -3755,7 +3755,7 @@ fi
+@@ -3936,7 +3936,7 @@ fi
# generate output files
@@ -27,7 +26,7 @@ index 1354b7f..7beda7d 100644
echo "creating Modules/Setup"
diff --git a/cross-python-wrapper.in b/cross-python-wrapper.in
-new file mode 100755
+new file mode 100644
index 0000000..9cfd36f
--- /dev/null
+++ b/cross-python-wrapper.in
@@ -46,5 +45,5 @@ index 0000000..9cfd36f
+
+exec @PYTHON_FOR_BUILD@ "${@}"
--
-1.5.6.3
+1.7.2.3
diff --git a/patches/Python-2.6.4/0017-fix-for-new-autoconf.diff b/patches/Python-2.6.6/0015-0017-fix-for-new-autoconf.diff.patch
index 122b6abdc..127a94d4e 100644
--- a/patches/Python-2.6.4/0017-fix-for-new-autoconf.diff
+++ b/patches/Python-2.6.6/0015-0017-fix-for-new-autoconf.diff.patch
@@ -1,12 +1,16 @@
+From: unknown author <unknown.author@example.com>
+Date: Tue, 8 Feb 2011 15:10:31 +0100
+Subject: [PATCH] 0017-fix-for-new-autoconf.diff
+
---
configure.in | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
+ 1 files changed, 2 insertions(+), 1 deletions(-)
-Index: b/configure.in
-===================================================================
+diff --git a/configure.in b/configure.in
+index 9b80a5d..2895a7d 100644
--- a/configure.in
+++ b/configure.in
-@@ -1362,8 +1362,9 @@ AC_CHECK_SIZEOF(fpos_t, 4)
+@@ -1458,8 +1458,9 @@ AC_CHECK_SIZEOF(fpos_t, 4)
AC_CHECK_SIZEOF(size_t, 4)
AC_CHECK_SIZEOF(pid_t, 4)
@@ -17,3 +21,6 @@ Index: b/configure.in
AC_DEFINE(HAVE_LONG_LONG, 1, [Define this if you have the type long long.])
fi
+--
+1.7.2.3
+
diff --git a/patches/Python-2.6.4/0018-dont-add-rpaths.diff b/patches/Python-2.6.6/0016-0018-dont-add-rpaths.diff.patch
index e03e56aaf..08cd8c1e9 100644
--- a/patches/Python-2.6.4/0018-dont-add-rpaths.diff
+++ b/patches/Python-2.6.6/0016-0018-dont-add-rpaths.diff.patch
@@ -1,12 +1,16 @@
+From: unknown author <unknown.author@example.com>
+Date: Tue, 8 Feb 2011 15:10:31 +0100
+Subject: [PATCH] 0018-dont-add-rpaths.diff
+
---
setup.py | 3 ---
- 1 file changed, 3 deletions(-)
+ 1 files changed, 0 insertions(+), 3 deletions(-)
-Index: b/setup.py
-===================================================================
+diff --git a/setup.py b/setup.py
+index d3aac1b..8c86ed8 100644
--- a/setup.py
+++ b/setup.py
-@@ -893,7 +893,6 @@ class PyBuildExt(build_ext):
+@@ -991,7 +991,6 @@ class PyBuildExt(build_ext):
exts.append(Extension('_bsddb', ['_bsddb.c'],
depends = ['bsddb.h'],
library_dirs=dblib_dir,
@@ -14,7 +18,7 @@ Index: b/setup.py
include_dirs=db_incs,
libraries=dblibs))
else:
-@@ -995,7 +994,6 @@ class PyBuildExt(build_ext):
+@@ -1100,7 +1099,6 @@ class PyBuildExt(build_ext):
include_dirs=["Modules/_sqlite",
sqlite_incdir],
library_dirs=sqlite_libdir,
@@ -22,7 +26,7 @@ Index: b/setup.py
extra_link_args=sqlite_extra_link_args,
libraries=["sqlite3",]))
else:
-@@ -1065,7 +1063,6 @@ class PyBuildExt(build_ext):
+@@ -1176,7 +1174,6 @@ class PyBuildExt(build_ext):
elif db_incs is not None:
exts.append( Extension('dbm', ['dbmmodule.c'],
library_dirs=dblib_dir,
@@ -30,3 +34,6 @@ Index: b/setup.py
include_dirs=db_incs,
define_macros=[('HAVE_BERKDB_H',None),
('DB_DBM_HSEARCH',None)],
+--
+1.7.2.3
+
diff --git a/patches/Python-2.6.4/0019-assume-non-buggy-getaddrinfo-when-cross-compiling.patch b/patches/Python-2.6.6/0017-assume-non-buggy-getaddrinfo-when-cross-compiling.patch
index e76430e5b..1b012ae6e 100644
--- a/patches/Python-2.6.4/0019-assume-non-buggy-getaddrinfo-when-cross-compiling.patch
+++ b/patches/Python-2.6.6/0017-assume-non-buggy-getaddrinfo-when-cross-compiling.patch
@@ -8,10 +8,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.in b/configure.in
-index 89acf25..34dd048 100644
+index 2895a7d..9de0dcc 100644
--- a/configure.in
+++ b/configure.in
-@@ -2909,8 +2909,8 @@ AC_MSG_RESULT(good)
+@@ -2954,8 +2954,8 @@ AC_MSG_RESULT(good)
buggygetaddrinfo=no,
AC_MSG_RESULT(buggy)
buggygetaddrinfo=yes,
@@ -23,5 +23,5 @@ index 89acf25..34dd048 100644
buggygetaddrinfo=yes
])
--
-1.7.1
+1.7.2.3
diff --git a/patches/Python-2.6.4/autogen.sh b/patches/Python-2.6.6/autogen.sh
index 903ce7847..903ce7847 100755
--- a/patches/Python-2.6.4/autogen.sh
+++ b/patches/Python-2.6.6/autogen.sh
diff --git a/patches/Python-2.6.6/series b/patches/Python-2.6.6/series
new file mode 100644
index 000000000..c99720e28
--- /dev/null
+++ b/patches/Python-2.6.6/series
@@ -0,0 +1,19 @@
+# generated by git-ptx-patches
+0001-Add-support-for-socketcan-to-the-python-socket-modul.patch
+0002-printf-format-zd.patch
+0003-use-AC_COMPILE_IFELSE-rather-than-AC_TRY_RUN.patch
+0004-use-AC_CHECK_SIZEOF-rather-than-AC_TRY_COMPILE-for-l.patch
+0005-use-AC_TYPE_LONG_DOUBLE-to-detect-long-double-suppor.patch
+0006-use-AC_CHECK_SIZEOF-rather-than-handcrafted-test-wit.patch
+0007-fix-silent-flag.patch
+0008-use-PGEN_FOR_BUILD.patch
+0009-introduce-and-use-PYTHON_FOR_BUILD.patch
+0010-distutils-introduce-and-use-EXECUTABLE_DIRNAME.patch
+0011-setup.py-don-t-leak-host-path-into-cross-compilation.patch
+0012-setup.py-skip-import-check-while-cross-compiling.patch
+0013-add-cross-compilation-support.patch
+0014-provide-wrapper-for-cross-python.patch
+0015-0017-fix-for-new-autoconf.diff.patch
+0016-0018-dont-add-rpaths.diff.patch
+0017-assume-non-buggy-getaddrinfo-when-cross-compiling.patch
+# af3d1249cd85718d1faf28b107c2d3df - git-ptx-patches magic