From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: From: Robert Schwebel Date: Sun, 14 Dec 2014 10:42:07 +0100 Message-Id: <1418550130-9125-1-git-send-email-r.schwebel@pengutronix.de> Subject: [ptxdist] [PATCH 1/4] python: prepare version bump Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de Cc: Robert Schwebel Copy old patches in preparation of version bump. Signed-off-by: Robert Schwebel --- ...-for-socketcan-to-the-python-socket-modul.patch | 224 +++++++++++++++++++++ ...K_SIZEOF-rather-than-AC_TRY_COMPILE-for-l.patch | 37 ++++ ..._LONG_DOUBLE-to-detect-long-double-suppor.patch | 35 ++++ patches/Python-2.7.9/0004-use-PGEN_FOR_BUILD.patch | 32 +++ ...n-t-leak-host-path-into-cross-compilation.patch | 40 ++++ .../0006-add-cross-compilation-support.patch | 61 ++++++ .../0007-python-don-t-add-rpaths-in-setup.py.patch | 31 +++ .../Python-2.7.9/0008-add-more-search-paths.patch | 28 +++ ...sting-LD_LIBRARY_PATH-during-make-not-dur.patch | 25 +++ patches/Python-2.7.9/autogen.sh | 14 ++ patches/Python-2.7.9/series | 12 ++ 11 files changed, 539 insertions(+) create mode 100644 patches/Python-2.7.9/0001-Add-support-for-socketcan-to-the-python-socket-modul.patch create mode 100644 patches/Python-2.7.9/0002-use-AC_CHECK_SIZEOF-rather-than-AC_TRY_COMPILE-for-l.patch create mode 100644 patches/Python-2.7.9/0003-use-AC_TYPE_LONG_DOUBLE-to-detect-long-double-suppor.patch create mode 100644 patches/Python-2.7.9/0004-use-PGEN_FOR_BUILD.patch create mode 100644 patches/Python-2.7.9/0005-setup.py-don-t-leak-host-path-into-cross-compilation.patch create mode 100644 patches/Python-2.7.9/0006-add-cross-compilation-support.patch create mode 100644 patches/Python-2.7.9/0007-python-don-t-add-rpaths-in-setup.py.patch create mode 100644 patches/Python-2.7.9/0008-add-more-search-paths.patch create mode 100644 patches/Python-2.7.9/0009-resolve-existing-LD_LIBRARY_PATH-during-make-not-dur.patch create mode 100755 patches/Python-2.7.9/autogen.sh create mode 100644 patches/Python-2.7.9/series 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 new file mode 100644 index 0000000..360df3e --- /dev/null +++ b/patches/Python-2.7.9/0001-Add-support-for-socketcan-to-the-python-socket-modul.patch @@ -0,0 +1,224 @@ +From: Michael Olbrich +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 +Signed-off-by: Marc Kleine-Budde +--- + Lib/plat-linux2/IN.py | 2 ++ + Modules/socketmodule.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++ + Modules/socketmodule.h | 11 +++++++ + configure.ac | 13 ++++++++ + 4 files changed, 115 insertions(+) + +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 bdc055d..066221a 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); + + #define SAS2SA(x) ((struct sockaddr *)(x)) + ++#ifdef ENABLE_CAN ++#include ++#endif ++ + /* + * Constants for getnameinfo() + */ +@@ -1097,6 +1101,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) { +@@ -1383,6 +1403,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: + { +@@ -1633,6 +1675,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: + { +@@ -4758,6 +4808,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); +@@ -5114,6 +5168,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 8515499..3eae3eb 100644 +--- a/Modules/socketmodule.h ++++ b/Modules/socketmodule.h +@@ -55,6 +55,14 @@ typedef int socklen_t; + #include + #endif + ++#define AF_CAN 29 ++#define PF_CAN AF_CAN ++ ++#ifdef HAVE_LINUX_CAN_H ++#define ENABLE_CAN 1 ++#include ++#endif ++ + #ifdef HAVE_BLUETOOTH_H + #include + #endif +@@ -106,6 +114,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.ac b/configure.ac +index 30f5bf4..c9b78ff 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1539,6 +1539,19 @@ AC_CHECK_HEADERS(linux/netlink.h,,,[ + #endif + ]) + ++AC_CHECK_HEADERS(linux/can.h,[],[],[#include ]) ++# check for AF_CAN ++AC_TRY_COMPILE( ++ [[#include ++ 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.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 new file mode 100644 index 0000000..08c3dd8 --- /dev/null +++ b/patches/Python-2.7.9/0002-use-AC_CHECK_SIZEOF-rather-than-AC_TRY_COMPILE-for-l.patch @@ -0,0 +1,37 @@ +From: Marc Kleine-Budde +Date: Fri, 24 Apr 2009 18:44:11 +0200 +Subject: [PATCH] use AC_CHECK_SIZEOF rather than AC_TRY_COMPILE for long long + detection + +AC_CHECK_SIZEOF does first detect if the type is available and detects +its size. Use it, rather than hand crafted function with AC_TRY_COMPILE. + +Signed-off-by: Marc Kleine-Budde +--- + configure.ac | 12 ++++-------- + 1 file changed, 4 insertions(+), 8 deletions(-) + +diff --git a/configure.ac b/configure.ac +index c9b78ff..ebc8285 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1676,15 +1676,11 @@ AC_CHECK_SIZEOF(fpos_t, 4) + AC_CHECK_SIZEOF(size_t, 4) + AC_CHECK_SIZEOF(pid_t, 4) + +-AC_MSG_CHECKING(for long long support) +-have_long_long=no +-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[long long x; x = (long long)0;]])],[ +- AC_DEFINE(HAVE_LONG_LONG, 1, [Define this if you have the type long long.]) ++AC_TYPE_LONG_LONG_INT ++AC_CHECK_SIZEOF(long long) ++if test "$ac_cv_type_long_long_int" = "yes" ; then + have_long_long=yes +-],[]) +-AC_MSG_RESULT($have_long_long) +-if test "$have_long_long" = yes ; then +-AC_CHECK_SIZEOF(long long, 8) ++ AC_DEFINE(HAVE_LONG_LONG, 1, [Define this if you have the type long long.]) + fi + + AC_MSG_CHECKING(for long double support) 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 new file mode 100644 index 0000000..9fdac2f --- /dev/null +++ b/patches/Python-2.7.9/0003-use-AC_TYPE_LONG_DOUBLE-to-detect-long-double-suppor.patch @@ -0,0 +1,35 @@ +From: Marc Kleine-Budde +Date: Fri, 24 Apr 2009 18:47:19 +0200 +Subject: [PATCH] use AC_TYPE_LONG_DOUBLE to detect long double support + +use the correct AC_TYPE_LONG_DOUBLE function rahter than hand crafted +test to detect long double support. + +Signed-off-by: Marc Kleine-Budde +--- + configure.ac | 12 ++---------- + 1 file changed, 2 insertions(+), 10 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ebc8285..764a08f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1683,16 +1683,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 + +-AC_MSG_CHECKING(for long double support) +-have_long_double=no +-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[long double x; x = (long double)0;]])],[ +- AC_DEFINE(HAVE_LONG_DOUBLE, 1, [Define this if you have the type long double.]) +- have_long_double=yes +-],[]) +-AC_MSG_RESULT($have_long_double) +-if test "$have_long_double" = yes ; then +-AC_CHECK_SIZEOF(long double, 12) +-fi ++AC_TYPE_LONG_DOUBLE ++AC_CHECK_SIZEOF(long double) + + AC_MSG_CHECKING(for _Bool support) + have_c99_bool=no 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 new file mode 100644 index 0000000..d892f97 --- /dev/null +++ b/patches/Python-2.7.9/0004-use-PGEN_FOR_BUILD.patch @@ -0,0 +1,32 @@ +From: Marc Kleine-Budde +Date: Wed, 12 Jun 2013 13:53:15 +0200 +Subject: [PATCH] use PGEN_FOR_BUILD + +Signed-off-by: Marc Kleine-Budde +Signed-off-by: Michael Olbrich +--- + Makefile.pre.in | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/Makefile.pre.in b/Makefile.pre.in +index 9d55550..4461970 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -227,6 +227,8 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@ + ########################################################################## + # Parser + PGEN= Parser/pgen$(EXE) ++PGEN_FOR_BUILD= $(PGEN) ++ + + PSRCS= \ + Parser/acceler.c \ +@@ -593,7 +595,7 @@ Modules/pwdmodule.o: $(srcdir)/Modules/pwdmodule.c $(srcdir)/Modules/posixmodule + $(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS) + @$(MKDIR_P) Include + $(MAKE) $(PGEN) +- $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) ++ $(PGEN_FOR_BUILD) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) + $(GRAMMAR_C): $(GRAMMAR_H) $(GRAMMAR_INPUT) $(PGENSRCS) + $(MAKE) $(GRAMMAR_H) + touch $(GRAMMAR_C) 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 new file mode 100644 index 0000000..a9537bc --- /dev/null +++ b/patches/Python-2.7.9/0005-setup.py-don-t-leak-host-path-into-cross-compilation.patch @@ -0,0 +1,40 @@ +From: Marc Kleine-Budde +Date: Tue, 28 Apr 2009 19:07:54 +0200 +Subject: [PATCH] setup.py: don't leak host path into cross compilation + environment + +During cross compilation we don't host path (neither include nor library +search patch) to leak into our environment. + +Signed-off-by: Marc Kleine-Budde +--- + setup.py | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 716f08e..c556209 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): + # 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 cross_compiling: ++ f = '' ++ + + if host_platform == 'darwin': + if is_macosx_sdk_path(f): 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 new file mode 100644 index 0000000..180c3eb --- /dev/null +++ b/patches/Python-2.7.9/0006-add-cross-compilation-support.patch @@ -0,0 +1,61 @@ +From: Marc Kleine-Budde +Date: Mon, 4 May 2009 14:39:18 +0200 +Subject: [PATCH] add cross compilation support + +This patch adds preliminary cross compilation support to python. + +Signed-off-by: Marc Kleine-Budde +--- + Makefile.pre.in | 12 ++++++++---- + configure.ac | 7 +++++++ + 2 files changed, 15 insertions(+), 4 deletions(-) + +diff --git a/Makefile.pre.in b/Makefile.pre.in +index 4461970..584ed4f 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -84,6 +84,10 @@ CFLAGSFORSHARED=@CFLAGSFORSHARED@ + # C flags used for building the interpreter object files + PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAGSFORSHARED) -DPy_BUILD_CORE + ++# cross compiler options ++ifndef DESTDIR ++sysroot= @SYSROOT@ ++endif + + # Machine-dependent subdirectories + MACHDEP= @MACHDEP@ +@@ -102,11 +106,11 @@ datarootdir= @datarootdir@ + + # Expanded directories + BINDIR= @bindir@ +-LIBDIR= @libdir@ ++LIBDIR= $(sysroot)@libdir@ + MANDIR= @mandir@ +-INCLUDEDIR= @includedir@ +-CONFINCLUDEDIR= $(exec_prefix)/include +-SCRIPTDIR= $(prefix)/lib ++INCLUDEDIR= $(sysroot)@includedir@ ++CONFINCLUDEDIR= $(sysroot)$(exec_prefix)/include ++SCRIPTDIR= $(sysroot)$(prefix)/lib + + # Detailed destination directories + BINLIBDEST= $(LIBDIR)/python$(VERSION) +diff --git a/configure.ac b/configure.ac +index 764a08f..c05c5fb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -939,6 +939,13 @@ if test "$cross_compiling" = yes; then + RUNSHARED= + fi + ++# sysroot ++AC_SUBST(SYSROOT) ++if test "$cross_compiling" = yes; then ++ AC_MSG_CHECKING([for SYSROOT]) ++ AC_MSG_RESULT([$SYSROOT]) ++fi ++ + AC_MSG_RESULT($LDLIBRARY) + + AC_PROG_RANLIB 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 new file mode 100644 index 0000000..fef8858 --- /dev/null +++ b/patches/Python-2.7.9/0007-python-don-t-add-rpaths-in-setup.py.patch @@ -0,0 +1,31 @@ +From: unknown author +Date: Tue, 8 Feb 2011 15:10:31 +0100 +Subject: [PATCH] python: don't add rpaths in setup.py + +We don't add rpaths. + +Signed-off-by: Michael Olbrich +--- + setup.py | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/setup.py b/setup.py +index c556209..66a97bd 100644 +--- a/setup.py ++++ b/setup.py +@@ -1077,7 +1077,6 @@ class PyBuildExt(build_ext): + exts.append(Extension('_bsddb', ['_bsddb.c'], + depends = ['bsddb.h'], + library_dirs=dblib_dir, +- runtime_library_dirs=dblib_dir, + 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 new file mode 100644 index 0000000..f160ac6 --- /dev/null +++ b/patches/Python-2.7.9/0008-add-more-search-paths.patch @@ -0,0 +1,28 @@ +From: Michael Olbrich +Date: Thu, 13 Jun 2013 10:42:58 +0200 +Subject: [PATCH] add more search paths + +Without this setup.py won't find libs in /lib + +Signed-off-by: Michael Olbrich +--- + setup.py | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 66a97bd..7bd9e9c 100644 +--- a/setup.py ++++ b/setup.py +@@ -484,8 +484,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) +- add_dir_to_list(self.compiler.library_dirs, +- sysconfig.get_config_var("LIBDIR")) ++ libdir = sysconfig.get_config_var("LIBDIR") ++ add_dir_to_list(self.compiler.library_dirs, libdir) ++ if libdir.endswith('/usr/lib'): ++ add_dir_to_list(self.compiler.library_dirs, libdir.replace('/usr/lib','/lib')) + add_dir_to_list(self.compiler.include_dirs, + sysconfig.get_config_var("INCLUDEDIR")) + 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 new file mode 100644 index 0000000..c0e7280 --- /dev/null +++ b/patches/Python-2.7.9/0009-resolve-existing-LD_LIBRARY_PATH-during-make-not-dur.patch @@ -0,0 +1,25 @@ +From: Michael Olbrich +Date: Wed, 5 Feb 2014 12:16:12 +0100 +Subject: [PATCH] resolve existing LD_LIBRARY_PATH during make, not during + configure + +Otherwise, calling "make install" with fakeroot may not work correctly. + +Signed-off-by: Michael Olbrich +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index c05c5fb..9274125 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -885,7 +885,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}' + case $ac_sys_system in + FreeBSD*) + SOVERSION=`echo $SOVERSION|cut -d "." -f 1` diff --git a/patches/Python-2.7.9/autogen.sh b/patches/Python-2.7.9/autogen.sh new file mode 100755 index 0000000..903ce78 --- /dev/null +++ b/patches/Python-2.7.9/autogen.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +# to add config.guess and config.sub +automake --copy --add-missing || true + +autoheader --force + +autoconf \ + --force \ + --warnings=cross \ + --warnings=syntax \ + --warnings=obsolete \ + --warnings=unsupported + diff --git a/patches/Python-2.7.9/series b/patches/Python-2.7.9/series new file mode 100644 index 0000000..47df268 --- /dev/null +++ b/patches/Python-2.7.9/series @@ -0,0 +1,12 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-Add-support-for-socketcan-to-the-python-socket-modul.patch +0002-use-AC_CHECK_SIZEOF-rather-than-AC_TRY_COMPILE-for-l.patch +0003-use-AC_TYPE_LONG_DOUBLE-to-detect-long-double-suppor.patch +0004-use-PGEN_FOR_BUILD.patch +0005-setup.py-don-t-leak-host-path-into-cross-compilation.patch +0006-add-cross-compilation-support.patch +0007-python-don-t-add-rpaths-in-setup.py.patch +0008-add-more-search-paths.patch +0009-resolve-existing-LD_LIBRARY_PATH-during-make-not-dur.patch +# c22b85583b9b9fc00386bba7094689ba - git-ptx-patches magic -- 2.1.3 -- ptxdist mailing list ptxdist@pengutronix.de