From: Robert Schwebel <r.schwebel@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Robert Schwebel <r.schwebel@pengutronix.de>
Subject: [ptxdist] [PATCH 2/4] python: update patches for 2.7.9
Date: Sun, 14 Dec 2014 10:42:08 +0100 [thread overview]
Message-ID: <1418550130-9125-2-git-send-email-r.schwebel@pengutronix.de> (raw)
In-Reply-To: <1418550130-9125-1-git-send-email-r.schwebel@pengutronix.de>
Rework patch stack for python-2.7.9. Two hunks have been found in
mainline meanwhile and can be removed here.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
...-for-socketcan-to-the-python-socket-modul.patch | 22 +++++++++++-----------
...K_SIZEOF-rather-than-AC_TRY_COMPILE-for-l.patch | 4 ++--
..._LONG_DOUBLE-to-detect-long-double-suppor.patch | 4 ++--
patches/Python-2.7.9/0004-use-PGEN_FOR_BUILD.patch | 6 +++---
...n-t-leak-host-path-into-cross-compilation.patch | 21 ++++-----------------
.../0006-add-cross-compilation-support.patch | 6 +++---
.../0007-python-don-t-add-rpaths-in-setup.py.patch | 16 ++++------------
.../Python-2.7.9/0008-add-more-search-paths.patch | 4 ++--
...sting-LD_LIBRARY_PATH-during-make-not-dur.patch | 8 ++++----
9 files changed, 35 insertions(+), 56 deletions(-)
diff --git a/patches/Python-2.7.9/0001-Add-support-for-socketcan-to-the-python-socket-modul.patch b/patches/Python-2.7.9/0001-Add-support-for-socketcan-to-the-python-socket-modul.patch
index 360df3e..0994ad2 100644
--- a/patches/Python-2.7.9/0001-Add-support-for-socketcan-to-the-python-socket-modul.patch
+++ b/patches/Python-2.7.9/0001-Add-support-for-socketcan-to-the-python-socket-modul.patch
@@ -15,7 +15,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
4 files changed, 115 insertions(+)
diff --git a/Lib/plat-linux2/IN.py b/Lib/plat-linux2/IN.py
-index ad307f6..f72ae88 100644
+index ad307f65398b..f72ae886cad8 100644
--- a/Lib/plat-linux2/IN.py
+++ b/Lib/plat-linux2/IN.py
@@ -384,6 +384,7 @@ PF_SNA = 22
@@ -35,10 +35,10 @@ index ad307f6..f72ae88 100644
AF_MAX = PF_MAX
SOL_RAW = 255
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
-index bdc055d..066221a 100644
+index e9e4479a6678..bddf4ba7782e 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
-@@ -420,6 +420,10 @@ const char *inet_ntop(int af, const void *src, char *dst, socklen_t size);
+@@ -424,6 +424,10 @@ const char *inet_ntop(int af, const void *src, char *dst, socklen_t size);
#define SAS2SA(x) ((struct sockaddr *)(x))
@@ -49,7 +49,7 @@ index bdc055d..066221a 100644
/*
* Constants for getnameinfo()
*/
-@@ -1097,6 +1101,22 @@ makesockaddr(int sockfd, struct sockaddr *addr, int addrlen, int proto)
+@@ -1101,6 +1105,22 @@ makesockaddr(int sockfd, struct sockaddr *addr, int addrlen, int proto)
}
#endif
@@ -72,7 +72,7 @@ index bdc055d..066221a 100644
#ifdef USE_BLUETOOTH
case AF_BLUETOOTH:
switch (proto) {
-@@ -1383,6 +1403,28 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
+@@ -1387,6 +1407,28 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
}
#endif
@@ -101,7 +101,7 @@ index bdc055d..066221a 100644
#ifdef USE_BLUETOOTH
case AF_BLUETOOTH:
{
-@@ -1633,6 +1675,14 @@ getsockaddrlen(PySocketSockObject *s, socklen_t *len_ret)
+@@ -1637,6 +1679,14 @@ getsockaddrlen(PySocketSockObject *s, socklen_t *len_ret)
}
#endif
@@ -116,7 +116,7 @@ index bdc055d..066221a 100644
#ifdef USE_BLUETOOTH
case AF_BLUETOOTH:
{
-@@ -4758,6 +4808,10 @@ init_socket(void)
+@@ -4771,6 +4821,10 @@ init_socket(void)
PyModule_AddIntConstant(m, "AF_LLC", AF_LLC);
#endif
@@ -127,7 +127,7 @@ index bdc055d..066221a 100644
#ifdef USE_BLUETOOTH
PyModule_AddIntConstant(m, "AF_BLUETOOTH", AF_BLUETOOTH);
PyModule_AddIntConstant(m, "BTPROTO_L2CAP", BTPROTO_L2CAP);
-@@ -5114,6 +5168,41 @@ init_socket(void)
+@@ -5127,6 +5181,41 @@ init_socket(void)
PyModule_AddIntConstant(m, "IPPROTO_MAX", IPPROTO_MAX);
#endif
@@ -170,7 +170,7 @@ index bdc055d..066221a 100644
#ifdef IPPORT_RESERVED
PyModule_AddIntConstant(m, "IPPORT_RESERVED", IPPORT_RESERVED);
diff --git a/Modules/socketmodule.h b/Modules/socketmodule.h
-index 8515499..3eae3eb 100644
+index d98e00e88d27..3b6e22e29d3a 100644
--- a/Modules/socketmodule.h
+++ b/Modules/socketmodule.h
@@ -55,6 +55,14 @@ typedef int socklen_t;
@@ -199,10 +199,10 @@ index 8515499..3eae3eb 100644
struct sockaddr_l2 bt_l2;
struct sockaddr_rc bt_rc;
diff --git a/configure.ac b/configure.ac
-index 30f5bf4..c9b78ff 100644
+index 94a215e0cf07..3e9186c84cb6 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1539,6 +1539,19 @@ AC_CHECK_HEADERS(linux/netlink.h,,,[
+@@ -1542,6 +1542,19 @@ AC_CHECK_HEADERS(linux/netlink.h,,,[
#endif
])
diff --git a/patches/Python-2.7.9/0002-use-AC_CHECK_SIZEOF-rather-than-AC_TRY_COMPILE-for-l.patch b/patches/Python-2.7.9/0002-use-AC_CHECK_SIZEOF-rather-than-AC_TRY_COMPILE-for-l.patch
index 08c3dd8..97781a5 100644
--- a/patches/Python-2.7.9/0002-use-AC_CHECK_SIZEOF-rather-than-AC_TRY_COMPILE-for-l.patch
+++ b/patches/Python-2.7.9/0002-use-AC_CHECK_SIZEOF-rather-than-AC_TRY_COMPILE-for-l.patch
@@ -12,10 +12,10 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/configure.ac b/configure.ac
-index c9b78ff..ebc8285 100644
+index 3e9186c84cb6..34949fe34037 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1676,15 +1676,11 @@ AC_CHECK_SIZEOF(fpos_t, 4)
+@@ -1679,15 +1679,11 @@ AC_CHECK_SIZEOF(fpos_t, 4)
AC_CHECK_SIZEOF(size_t, 4)
AC_CHECK_SIZEOF(pid_t, 4)
diff --git a/patches/Python-2.7.9/0003-use-AC_TYPE_LONG_DOUBLE-to-detect-long-double-suppor.patch b/patches/Python-2.7.9/0003-use-AC_TYPE_LONG_DOUBLE-to-detect-long-double-suppor.patch
index 9fdac2f..57d2c2f 100644
--- a/patches/Python-2.7.9/0003-use-AC_TYPE_LONG_DOUBLE-to-detect-long-double-suppor.patch
+++ b/patches/Python-2.7.9/0003-use-AC_TYPE_LONG_DOUBLE-to-detect-long-double-suppor.patch
@@ -11,10 +11,10 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/configure.ac b/configure.ac
-index ebc8285..764a08f 100644
+index 34949fe34037..9f9153fd8f75 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1683,16 +1683,8 @@ if test "$ac_cv_type_long_long_int" = "yes" ; then
+@@ -1686,16 +1686,8 @@ if test "$ac_cv_type_long_long_int" = "yes" ; then
AC_DEFINE(HAVE_LONG_LONG, 1, [Define this if you have the type long long.])
fi
diff --git a/patches/Python-2.7.9/0004-use-PGEN_FOR_BUILD.patch b/patches/Python-2.7.9/0004-use-PGEN_FOR_BUILD.patch
index d892f97..1194e88 100644
--- a/patches/Python-2.7.9/0004-use-PGEN_FOR_BUILD.patch
+++ b/patches/Python-2.7.9/0004-use-PGEN_FOR_BUILD.patch
@@ -9,10 +9,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 9d55550..4461970 100644
+index 7f4ec2f55e7f..df38eb5158d1 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -227,6 +227,8 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@
+@@ -234,6 +234,8 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@
##########################################################################
# Parser
PGEN= Parser/pgen$(EXE)
@@ -21,7 +21,7 @@ index 9d55550..4461970 100644
PSRCS= \
Parser/acceler.c \
-@@ -593,7 +595,7 @@ Modules/pwdmodule.o: $(srcdir)/Modules/pwdmodule.c $(srcdir)/Modules/posixmodule
+@@ -611,7 +613,7 @@ Modules/pwdmodule.o: $(srcdir)/Modules/pwdmodule.c $(srcdir)/Modules/posixmodule
$(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS)
@$(MKDIR_P) Include
$(MAKE) $(PGEN)
diff --git a/patches/Python-2.7.9/0005-setup.py-don-t-leak-host-path-into-cross-compilation.patch b/patches/Python-2.7.9/0005-setup.py-don-t-leak-host-path-into-cross-compilation.patch
index a9537bc..c29acee 100644
--- a/patches/Python-2.7.9/0005-setup.py-don-t-leak-host-path-into-cross-compilation.patch
+++ b/patches/Python-2.7.9/0005-setup.py-don-t-leak-host-path-into-cross-compilation.patch
@@ -8,27 +8,14 @@ search patch) to leak into our environment.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
- setup.py | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
+ setup.py | 3 +++
+ 1 file changed, 3 insertions(+)
diff --git a/setup.py b/setup.py
-index 716f08e..c556209 100644
+index 7868b7b241cc..542254496552 100644
--- a/setup.py
+++ b/setup.py
-@@ -437,8 +437,10 @@ class PyBuildExt(build_ext):
-
- def detect_modules(self):
- # Ensure that /usr/local is always used
-- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
-- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
-+
-+ if not cross_compiling:
-+ add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
-+ add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
- self.add_gcc_paths()
- self.add_multiarch_paths()
-
-@@ -1203,6 +1205,9 @@ class PyBuildExt(build_ext):
+@@ -1208,6 +1208,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"
diff --git a/patches/Python-2.7.9/0006-add-cross-compilation-support.patch b/patches/Python-2.7.9/0006-add-cross-compilation-support.patch
index 180c3eb..9e54fe5 100644
--- a/patches/Python-2.7.9/0006-add-cross-compilation-support.patch
+++ b/patches/Python-2.7.9/0006-add-cross-compilation-support.patch
@@ -11,7 +11,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 4461970..584ed4f 100644
+index df38eb5158d1..becc7182cfe6 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -84,6 +84,10 @@ CFLAGSFORSHARED=@CFLAGSFORSHARED@
@@ -42,10 +42,10 @@ index 4461970..584ed4f 100644
# Detailed destination directories
BINLIBDEST= $(LIBDIR)/python$(VERSION)
diff --git a/configure.ac b/configure.ac
-index 764a08f..c05c5fb 100644
+index 9f9153fd8f75..9ad2468ed32c 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -939,6 +939,13 @@ if test "$cross_compiling" = yes; then
+@@ -943,6 +943,13 @@ if test "$cross_compiling" = yes; then
RUNSHARED=
fi
diff --git a/patches/Python-2.7.9/0007-python-don-t-add-rpaths-in-setup.py.patch b/patches/Python-2.7.9/0007-python-don-t-add-rpaths-in-setup.py.patch
index fef8858..18c14c7 100644
--- a/patches/Python-2.7.9/0007-python-don-t-add-rpaths-in-setup.py.patch
+++ b/patches/Python-2.7.9/0007-python-don-t-add-rpaths-in-setup.py.patch
@@ -6,14 +6,14 @@ We don't add rpaths.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
- setup.py | 2 --
- 1 file changed, 2 deletions(-)
+ setup.py | 1 -
+ 1 file changed, 1 deletion(-)
diff --git a/setup.py b/setup.py
-index c556209..66a97bd 100644
+index 542254496552..f59ad7acd5cc 100644
--- a/setup.py
+++ b/setup.py
-@@ -1077,7 +1077,6 @@ class PyBuildExt(build_ext):
+@@ -1081,7 +1081,6 @@ class PyBuildExt(build_ext):
exts.append(Extension('_bsddb', ['_bsddb.c'],
depends = ['bsddb.h'],
library_dirs=dblib_dir,
@@ -21,11 +21,3 @@ index c556209..66a97bd 100644
include_dirs=db_incs,
libraries=dblibs))
else:
-@@ -1187,7 +1186,6 @@ class PyBuildExt(build_ext):
- include_dirs=["Modules/_sqlite",
- sqlite_incdir],
- library_dirs=sqlite_libdir,
-- runtime_library_dirs=sqlite_libdir,
- extra_link_args=sqlite_extra_link_args,
- libraries=["sqlite3",]))
- else:
diff --git a/patches/Python-2.7.9/0008-add-more-search-paths.patch b/patches/Python-2.7.9/0008-add-more-search-paths.patch
index f160ac6..fdf2217 100644
--- a/patches/Python-2.7.9/0008-add-more-search-paths.patch
+++ b/patches/Python-2.7.9/0008-add-more-search-paths.patch
@@ -10,10 +10,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/setup.py b/setup.py
-index 66a97bd..7bd9e9c 100644
+index f59ad7acd5cc..7f6702be3151 100644
--- a/setup.py
+++ b/setup.py
-@@ -484,8 +484,10 @@ class PyBuildExt(build_ext):
+@@ -486,8 +486,10 @@ class PyBuildExt(build_ext):
# (PYTHONFRAMEWORK is set) to avoid # linking problems when
# building a framework with different architectures than
# the one that is currently installed (issue #7473)
diff --git a/patches/Python-2.7.9/0009-resolve-existing-LD_LIBRARY_PATH-during-make-not-dur.patch b/patches/Python-2.7.9/0009-resolve-existing-LD_LIBRARY_PATH-during-make-not-dur.patch
index c0e7280..a90370e 100644
--- a/patches/Python-2.7.9/0009-resolve-existing-LD_LIBRARY_PATH-during-make-not-dur.patch
+++ b/patches/Python-2.7.9/0009-resolve-existing-LD_LIBRARY_PATH-during-make-not-dur.patch
@@ -11,15 +11,15 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
-index c05c5fb..9274125 100644
+index 9ad2468ed32c..6b8f436bb34b 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -885,7 +885,7 @@ if test $enable_shared = "yes"; then
+@@ -889,7 +889,7 @@ if test $enable_shared = "yes"; then
Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*)
LDLIBRARY='libpython$(VERSION).so'
BLDLIBRARY='-L. -lpython$(VERSION)'
-- RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
-+ RUNSHARED=LD_LIBRARY_PATH=`pwd`:'${LD_LIBRARY_PATH}'
+- RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
++ RUNSHARED=LD_LIBRARY_PATH=`pwd`:'${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}'
case $ac_sys_system in
FreeBSD*)
SOVERSION=`echo $SOVERSION|cut -d "." -f 1`
--
2.1.3
--
ptxdist mailing list
ptxdist@pengutronix.de
next prev parent reply other threads:[~2014-12-14 9:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-14 9:42 [ptxdist] [PATCH 1/4] python: prepare version bump Robert Schwebel
2014-12-14 9:42 ` Robert Schwebel [this message]
2014-12-14 9:42 ` [ptxdist] [PATCH 3/4] python: version bump 2.7.5 -> 2.7.9 Robert Schwebel
2014-12-14 9:42 ` [ptxdist] [PATCH 4/4] python: remove old patches Robert Schwebel
2015-01-12 15:35 ` [ptxdist] [PATCH 1/4] python: prepare version bump Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1418550130-9125-2-git-send-email-r.schwebel@pengutronix.de \
--to=r.schwebel@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox