Skip to contentSkip to conversation

Misc updates: libffi, python, gettext

PATCH New Thomas Petazzoni 2 participants 7 messages Jun 28, 2014 – Jul 1, 2014

lore
Share & tools
lore
#0 lore raw

cover Misc updates: libffi, python, gettext

Hello,

This set of patches bump libffi to version 3.1, and Python to version 2.7.7, and does a number of small related updates.

Best regards,

Thomas

Thomas Petazzoni (5):
libffi: bump to 3.1
libffi: remove some header files installed in /usr/lib in the target
python: bump to Python 2.7.7
python: do not install the IDLE editor
gettext: remove useless ABOUT-NLS file

 package/gettext/gettext.mk                         |   7 +
 package/libffi/libffi-003-fix-typo.patch           |  41 ++
 ...Add-missing-GNU-stack-markings-in-win32.S.patch |  36 ++
 .../libffi-005-Fix-paths-in-libffi.pc.in.patch     |  46 ++
 package/libffi/libffi-arc-01-Add-ARC-support.patch | 560 ---------------------
 .../libffi-arc-02-Rebuild-for-ARC-additions.patch  | 262 ----------
 .../libffi/libffi-arc-03-arc-Fix-build-error.patch |  43 --
 package/libffi/libffi.mk                           |   8 +-
 ...python-004-sysconfigdata-install-location.patch |   6 +-
 .../python/python-005-pyc-pyo-conditional.patch    |   2 +-
 .../python-006-cross-compile-getaddrinfo.patch     |   2 +-
 package/python/python-007-disable-extensions.patch |   4 +-
 package/python/python-010-fix-python-config.patch  |  39 +-
 .../python/python-011-remove-python-symlink.patch  |   9 +-
 package/python/python-013-fix-readline-6.3.patch   |  34 --
 .../python/python-100-optional-test-modules.patch  |  25 +-
 package/python/python-101-optional-pydoc.patch     |  12 +-
 package/python/python-102-optional-2to3.patch      |  16 +-
 package/python/python-103-optional-sqlite.patch    |  14 +-
 package/python/python-104-optional-tk.patch        |  20 +-
 package/python/python-105-optional-curses.patch    |   8 +-
 package/python/python-106-optional-expat.patch     |  12 +-
 .../python/python-107-optional-codecs-cjk.patch    |   2 +-
 package/python/python-108-optional-nis.patch       |   2 +-
 .../python/python-109-optional-unicodedata.patch   |   2 +-
 package/python/python-110-optional-db.patch        |  14 +-
 package/python/python-111-optional-ssl.patch       |   2 +-
 package/python/python-112-optional-bzip2.patch     |   2 +-
 package/python/python-113-optional-zlib.patch      |   2 +-
 package/python/python-114-remove-idle-editor.patch |  43 ++
 package/python/python.mk                           |   3 +-
 31 files changed, 282 insertions(+), 996 deletions(-)
 create mode 100644 package/libffi/libffi-003-fix-typo.patch
 create mode 100644 package/libffi/libffi-004-Add-missing-GNU-stack-markings-in-win32.S.patch
 create mode 100644 package/libffi/libffi-005-Fix-paths-in-libffi.pc.in.patch
 delete mode 100644 package/libffi/libffi-arc-01-Add-ARC-support.patch
 delete mode 100644 package/libffi/libffi-arc-02-Rebuild-for-ARC-additions.patch
 delete mode 100644 package/libffi/libffi-arc-03-arc-Fix-build-error.patch
 delete mode 100644 package/python/python-013-fix-readline-6.3.patch
 create mode 100644 package/python/python-114-remove-idle-editor.patch
Signature · 1 line
2.0.0
#1 lore raw

PATCH 1/5 libffi: bump to 3.1

Status of the patches:

- libffi-001-Fix-installation-location-of-libffi.patch, preserved.
- libffi-002-Fix-use-of-compact-eh-frames-on-MIPS.patch, preserved
- libffi-arc-01-Add-ARC-support.patch, removed, ARC support was merged upstream as of commit b082e15091961373c03d10ed0251f619ebb6ed76.
- libffi-arc-02-Rebuild-for-ARC-additions.patch, removed, this patch was merged upstream as of commit 0f8690a84c874ec09a090c8c6adfb93c594acac6.
- libffi-003-fix-typo.patch, added, reported on the upstream mailing list as being necessary, will be part of the next 3.1.1 release.
- libffi-004-Add-missing-GNU-stack-markings-in-win32.S.patch, same status as patch 003.
- libffi-005-Fix-paths-in-libffi.pc.in.patch, same status as patch 003.

The 3.1 release adds support for a number of architectures: ARC support, ppc64le support, NIOS II support. See
https://sourceware.org/ml/libffi-announce/2014/msg00000.html for details.

---
 package/libffi/libffi-003-fix-typo.patch           |  41 ++
 ...Add-missing-GNU-stack-markings-in-win32.S.patch |  36 ++
 .../libffi-005-Fix-paths-in-libffi.pc.in.patch     |  46 ++
 package/libffi/libffi-arc-01-Add-ARC-support.patch | 560 ---------------------
 .../libffi-arc-02-Rebuild-for-ARC-additions.patch  | 262 ----------
 .../libffi/libffi-arc-03-arc-Fix-build-error.patch |  43 --
 package/libffi/libffi.mk                           |   2 +-
 7 files changed, 124 insertions(+), 866 deletions(-)
 create mode 100644 package/libffi/libffi-003-fix-typo.patch
 create mode 100644 package/libffi/libffi-004-Add-missing-GNU-stack-markings-in-win32.S.patch
 create mode 100644 package/libffi/libffi-005-Fix-paths-in-libffi.pc.in.patch
 delete mode 100644 package/libffi/libffi-arc-01-Add-ARC-support.patch
 delete mode 100644 package/libffi/libffi-arc-02-Rebuild-for-ARC-additions.patch
 delete mode 100644 package/libffi/libffi-arc-03-arc-Fix-build-error.patch
package/libffi/libffi-003-fix-typo.patch new file +41 -0
new file mode 100644
index 0000000..f20804b
@@ -0,0 +1,41 @@
+From cbc5a3c0200aa6c2cf8d6798d69a21501557c83f Mon Sep 17 00:00:00 2001
+From: Ryan Hill <[email protected]>
+Date: Sat, 31 May 2014 08:26:34 -0400
+Subject: [PATCH 05/10] Fix typo
+
+This patch was borrowed from upstream, commit
+cbc5a3c0200aa6c2cf8d6798d69a21501557c83f, and will be part of the next
+3.1.1 release.
+
+Signed-off-by: Thomas Petazzoni <[email protected]>
+---
+ include/ffi.h.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/include/ffi.h.in b/include/ffi.h.in
+index 93c776f..70c6179 100644
+--- a/include/ffi.h.in
++++ b/include/ffi.h.in
+@@ -1,5 +1,5 @@
+ /* -----------------------------------------------------------------*-C-*-
+-   libffi @VERSION@ - Copyright (c) 2011 Anthony Green
++   libffi @VERSION@ - Copyright (c) 2011, 2014 Anthony Green
+                     - Copyright (c) 1996-2003, 2007, 2008 Red Hat, Inc.
+ 
+    Permission is hereby granted, free of charge, to any person
+@@ -221,10 +221,10 @@ typedef struct {
+ #endif
+ } ffi_cif;
+ 
+-#if HAVE_LONG_DOUBLE_VARIANT
++#if @HAVE_LONG_DOUBLE_VARIANT@
+ /* Used to adjust size/alignment of ffi types.  */
+ void ffi_prep_types (ffi_abi abi);
+-# endif
++#endif
+ 
+ /* Used internally, but overridden by some architectures */
+ ffi_status ffi_prep_cif_core(ffi_cif *cif,
+-- 
+2.0.0
+
package/libffi/libffi-004-Add-missing-GNU-stack-markings-in-win32.S.patch new file +36 -0
new file mode 100644
index 0000000..6097287
@@ -0,0 +1,36 @@
+From 978c9540154d320525488db1b7049277122f736d Mon Sep 17 00:00:00 2001
+From: Samuli Suominen <[email protected]>
+Date: Sat, 31 May 2014 08:53:10 -0400
+Subject: [PATCH 06/10] Add missing GNU stack markings in win32.S
+
+This patch was borrowed from upstream, commit
+978c9540154d320525488db1b7049277122f736d, and will be part of the next
+3.1.1 release.
+
+Signed-off-by: Thomas Petazzoni <[email protected]>
+---
+ src/x86/win32.S | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/x86/win32.S b/src/x86/win32.S
+index daf0e79..e42baf2 100644
+--- a/src/x86/win32.S
++++ b/src/x86/win32.S
+@@ -1,5 +1,6 @@
+ /* -----------------------------------------------------------------------
+-   win32.S - Copyright (c) 1996, 1998, 2001, 2002, 2009  Red Hat, Inc.
++   win32.S - Copyright (c) 2014  Anthony Green
++	     Copyright (c) 1996, 1998, 2001, 2002, 2009  Red Hat, Inc.
+ 	     Copyright (c) 2001  John Beniton
+ 	     Copyright (c) 2002  Ranjit Mathew
+ 	     Copyright (c) 2009  Daniel Witte
+@@ -1304,3 +1305,6 @@ L_ffi_closure_SYSV_inner$stub:
+ 
+ #endif /* !_MSC_VER */
+ 
++#if defined __ELF__ && defined __linux__
++	.section	.note.GNU-stack,"", at progbits
++#endif
+-- 
+2.0.0
+
package/libffi/libffi-005-Fix-paths-in-libffi.pc.in.patch new file +46 -0

46 lines not on this page · raw message

package/libffi/libffi-arc-01-Add-ARC-support.patch deleted +0 -560

560 lines not on this page · raw message

package/libffi/libffi-arc-02-Rebuild-for-ARC-additions.patch deleted +0 -262

262 lines not on this page · raw message

package/libffi/libffi-arc-03-arc-Fix-build-error.patch deleted +0 -43

43 lines not on this page · raw message

package/libffi/libffi.mk +1 -1
index 7463547..dc7132d 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBFFI_VERSION = 3.0.13
+LIBFFI_VERSION = 3.1
 LIBFFI_SITE    = ftp://sourceware.org/pub/libffi/
 LIBFFI_LICENSE = MIT
 LIBFFI_LICENSE_FILES = LICENSE
Signature · 1 line
2.0.0
#2 lore raw

PATCH 2/5 libffi: remove some header files installed in /usr/lib in the target

In reply to Thomas Petazzoni

For some reason, libffi installs some header files in /usr/lib/libffi-<version>/include, which is a non-standard location and therefore they do not get removed automatically by the target-finalize logic. This commit adds a post-install hook in libffi.mk to get rid of these unneeded headers on the target.

---
 package/libffi/libffi.mk | 6 ++++++
 1 file changed, 6 insertions(+)
package/libffi/libffi.mk +6 -0
index dc7132d..1377b8f 100644
@@ -22,6 +22,12 @@ endef
 
 LIBFFI_POST_INSTALL_STAGING_HOOKS += LIBFFI_MOVE_STAGING_HEADERS
 
+# Remove headers that are not at the usual location from the target
+define LIBFFI_REMOVE_TARGET_HEADERS
+	$(RM) -rf $(TARGET_DIR)/usr/lib/libffi-$(LIBFFI_VERSION)
+endef
+
+LIBFFI_POST_INSTALL_TARGET_HOOKS += LIBFFI_REMOVE_TARGET_HEADERS
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
Signature · 1 line
2.0.0
#3 lore raw

PATCH 3/5 python: bump to Python 2.7.7

In reply to Thomas Petazzoni

Status of patches:

- python-013-fix-readline-6.3.patch is removed, as it was a backport from an upstream fix.
- all other patches are updated, with no special changes other than solving minor conflicts.

---
 ...python-004-sysconfigdata-install-location.patch |  6 ++--
 .../python/python-005-pyc-pyo-conditional.patch    |  2 +-
 .../python-006-cross-compile-getaddrinfo.patch     |  2 +-
 package/python/python-007-disable-extensions.patch |  4 +--
 package/python/python-010-fix-python-config.patch  | 39 ++++++++++++----------
 .../python/python-011-remove-python-symlink.patch  |  9 ++---
 package/python/python-013-fix-readline-6.3.patch   | 34 -------------------
 .../python/python-100-optional-test-modules.patch  | 25 ++++++++------
 package/python/python-101-optional-pydoc.patch     | 12 +++----
 package/python/python-102-optional-2to3.patch      | 16 ++++-----
 package/python/python-103-optional-sqlite.patch    | 14 ++++----
 package/python/python-104-optional-tk.patch        | 20 +++++------
 package/python/python-105-optional-curses.patch    |  8 ++---
 package/python/python-106-optional-expat.patch     | 12 +++----
 .../python/python-107-optional-codecs-cjk.patch    |  2 +-
 package/python/python-108-optional-nis.patch       |  2 +-
 .../python/python-109-optional-unicodedata.patch   |  2 +-
 package/python/python-110-optional-db.patch        | 14 ++++----
 package/python/python-111-optional-ssl.patch       |  2 +-
 package/python/python-112-optional-bzip2.patch     |  2 +-
 package/python/python-113-optional-zlib.patch      |  2 +-
 package/python/python.mk                           |  2 +-
 22 files changed, 102 insertions(+), 129 deletions(-)
 delete mode 100644 package/python/python-013-fix-readline-6.3.patch
package/python/python-004-sysconfigdata-install-location.patch +3 -3
index 940dde7..2a5e4f4 100644
@@ -31,7 +31,7 @@ Index: b/Makefile.pre.in
  
  # Build the shared modules
  # Under GNU make, MAKEFLAGS are sorted and normalized; the 's' for
-@@ -965,7 +968,7 @@
+@@ -969,7 +972,7 @@
  		else	true; \
  		fi; \
  	done
@@ -40,7 +40,7 @@ Index: b/Makefile.pre.in
  	do \
  		if test -x $$i; then \
  			$(INSTALL_SCRIPT) $$i $(DESTDIR)$(LIBDEST); \
-@@ -975,6 +978,11 @@
+@@ -979,6 +982,11 @@
  			echo $(INSTALL_DATA) $$i $(LIBDEST); \
  		fi; \
  	done
@@ -52,7 +52,7 @@ Index: b/Makefile.pre.in
  	@for d in $(LIBSUBDIRS); \
  	do \
  		a=$(srcdir)/Lib/$$d; \
-@@ -1299,7 +1307,7 @@
+@@ -1303,7 +1311,7 @@
  		Modules/Setup Modules/Setup.local Modules/Setup.config \
  		Modules/ld_so_aix Modules/python.exp Misc/python.pc
  	-rm -f python*-gdb.py
package/python/python-005-pyc-pyo-conditional.patch +1 -1
index aa3b330..fbcdaa6 100644
@@ -2,7 +2,7 @@ Index: b/Makefile.pre.in
 ===================================================================
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -1013,24 +1013,32 @@
+@@ -1017,24 +1017,32 @@
  		$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
  			$(DESTDIR)$(LIBDEST)/distutils/tests ; \
  	fi
package/python/python-006-cross-compile-getaddrinfo.patch +1 -1
index 2c8248f..b16c7e9 100644
@@ -2,7 +2,7 @@ Index: b/configure.ac
 ===================================================================
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3337,7 +3337,7 @@
+@@ -3330,7 +3330,7 @@
  
  AC_MSG_RESULT($ac_cv_buggy_getaddrinfo)
  
package/python/python-007-disable-extensions.patch +2 -2
index c03f84c..10b0a7c 100644
@@ -19,7 +19,7 @@ Index: b/Makefile.pre.in
  		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
  
  # Build static library
-@@ -1154,7 +1157,8 @@
+@@ -1158,7 +1161,8 @@
  # Install the dynamically loadable modules
  # This goes into $(exec_prefix)
  sharedinstall: sharedmods
@@ -33,7 +33,7 @@ Index: b/configure.ac
 ===================================================================
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2275,6 +2275,8 @@
+@@ -2268,6 +2268,8 @@
  
  AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
  
package/python/python-010-fix-python-config.patch +21 -18
index f093d91..9e35de6 100644
@@ -6,10 +6,11 @@ on the sysconfig import that usually leads to bad data/results.
 
 Signed-off-by: Gustavo Zacarias <[email protected]>
 
-diff -Nura Python-2.7.6.orig/configure.ac Python-2.7.6/configure.ac
---- Python-2.7.6.orig/configure.ac	2014-02-25 12:48:16.726535439 -0300
-+++ Python-2.7.6/configure.ac	2014-02-25 12:49:00.992176462 -0300
-@@ -868,6 +868,7 @@
+Index: b/configure.ac
+===================================================================
+--- a/configure.ac
++++ b/configure.ac
+@@ -879,6 +879,7 @@
  
  # Other platforms follow
  if test $enable_shared = "yes"; then
@@ -17,7 +18,7 @@ diff -Nura Python-2.7.6.orig/configure.ac Python-2.7.6/configure.ac
    AC_DEFINE(Py_ENABLE_SHARED, 1, [Defined if Python is built as a shared library.])
    case $ac_sys_system in
      BeOS*)
-@@ -928,6 +929,7 @@
+@@ -939,6 +940,7 @@
  
    esac
  else # shared is disabled
@@ -25,7 +26,7 @@ diff -Nura Python-2.7.6.orig/configure.ac Python-2.7.6/configure.ac
    case $ac_sys_system in
      CYGWIN*)
            BLDLIBRARY='$(LIBRARY)'
-@@ -1905,6 +1907,9 @@
+@@ -1909,6 +1911,9 @@
  AC_SUBST(BLDSHARED)
  AC_SUBST(CCSHARED)
  AC_SUBST(LINKFORSHARED)
@@ -35,7 +36,7 @@ diff -Nura Python-2.7.6.orig/configure.ac Python-2.7.6/configure.ac
  # SO is the extension of shared libraries `(including the dot!)
  # -- usually .so, .sl on HP-UX, .dll on Cygwin
  AC_MSG_CHECKING(SO)
-@@ -4529,7 +4534,7 @@
+@@ -4550,7 +4555,7 @@
  AC_MSG_RESULT(done)
  
  # generate output files
@@ -44,10 +45,11 @@ diff -Nura Python-2.7.6.orig/configure.ac Python-2.7.6/configure.ac
  AC_CONFIG_FILES([Modules/ld_so_aix], [chmod +x Modules/ld_so_aix])
  AC_OUTPUT
  
-diff -Nura Python-2.7.6.orig/Makefile.pre.in Python-2.7.6/Makefile.pre.in
---- Python-2.7.6.orig/Makefile.pre.in	2014-02-25 12:48:16.611533773 -0300
-+++ Python-2.7.6/Makefile.pre.in	2014-02-25 12:49:00.993176482 -0300
-@@ -161,7 +161,7 @@
+Index: b/Makefile.pre.in
+===================================================================
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -163,7 +163,7 @@
  SUBDIRSTOO=	Include Lib Misc Demo
  
  # Files and directories to be distributed
@@ -56,7 +58,7 @@ diff -Nura Python-2.7.6.orig/Makefile.pre.in Python-2.7.6/Makefile.pre.in
  DISTFILES=	README ChangeLog $(CONFIGFILES)
  DISTDIRS=	$(SUBDIRS) $(SUBDIRSTOO) Ext-dummy
  DIST=		$(DISTFILES) $(DISTDIRS)
-@@ -405,7 +405,7 @@
+@@ -407,7 +407,7 @@
  
  # Default target
  all:		build_all
@@ -65,7 +67,7 @@ diff -Nura Python-2.7.6.orig/Makefile.pre.in Python-2.7.6/Makefile.pre.in
  
  # Compile a binary with gcc profile guided optimization.
  profile-opt:
-@@ -1045,10 +1045,12 @@
+@@ -1068,10 +1068,12 @@
  	fi; \
  	cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen
  
@@ -80,7 +82,7 @@ diff -Nura Python-2.7.6.orig/Makefile.pre.in Python-2.7.6/Makefile.pre.in
  
  # Install the include files
  INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY)
-@@ -1107,7 +1109,7 @@
+@@ -1130,7 +1132,7 @@
  	$(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(DESTDIR)$(LIBPL)/makesetup
  	$(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
  	$(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(VERSION)-config
@@ -89,7 +91,7 @@ diff -Nura Python-2.7.6.orig/Makefile.pre.in Python-2.7.6/Makefile.pre.in
  	@if [ -s Modules/python.exp -a \
  		"`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \
  		echo; echo "Installing support files for building shared extension modules on AIX:"; \
-@@ -1287,6 +1289,7 @@
+@@ -1311,6 +1313,7 @@
  		config.cache config.log pyconfig.h Modules/config.c
  	-rm -rf build platform
  	-rm -rf $(PYTHONFRAMEWORKDIR)
@@ -97,9 +99,10 @@ diff -Nura Python-2.7.6.orig/Makefile.pre.in Python-2.7.6/Makefile.pre.in
  
  # Make things extra clean, before making a distribution:
  # remove all generated files, even Makefile[.pre]
-diff -Nura Python-2.7.6.orig/Misc/python-config.sh.in Python-2.7.6/Misc/python-config.sh.in
---- Python-2.7.6.orig/Misc/python-config.sh.in	1969-12-31 21:00:00.000000000 -0300
-+++ Python-2.7.6/Misc/python-config.sh.in	2014-02-25 12:49:00.993176482 -0300
+Index: b/Misc/python-config.sh.in
+===================================================================
+--- /dev/null
++++ b/Misc/python-config.sh.in
 @@ -0,0 +1,102 @@
 +#!/bin/sh
 +
package/python/python-011-remove-python-symlink.patch +5 -4
index a9b1daa..af0a296 100644
@@ -6,10 +6,11 @@ python symlink points to.
 
 Signed-off-by: Samuel Martin <[email protected]>
 
-diff -purN a/Makefile.pre.in b/Makefile.pre.in
---- a/Makefile.pre.in	2014-03-02 17:56:56.529132499 +0100
-+++ b/Makefile.pre.in	2014-03-02 19:24:02.346491849 +0100
-@@ -857,17 +857,10 @@ $(DESTSHARED):
+Index: b/Makefile.pre.in
+===================================================================
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -858,17 +858,10 @@
  #  $(PYTHON) -> python2 -> python$(VERSION))
  # Also create equivalent chains for other installed files
  bininstall:	altbininstall
package/python/python-013-fix-readline-6.3.patch deleted +0 -34
deleted file mode 100644
index 97ae45c..0000000
@@ -1,34 +0,0 @@
-fix readline extension compilation against readline 6.3
-
-readline 6.3 removed some typedefs that had been deprecated for some time, but
-Python 2.7.6 still uses them and therefore fails to build the readline
-extension when it is enabled. This issue has been addressed in the Python bug
-tracker here: http://bugs.python.org/issue20374. The patch below is based on
-the readline_func_cast.patch patch uploaded there. Also see
-http://lists.gnu.org/archive/html/bug-readline/2014-03/msg00003.html for more
-information.
-
-This patch should be removed with the next Python 2.7 release, which should
-include the fix.
-
-Signed-off-by: Ivan Sergeev <[email protected]>
-
-diff -purN python-2.7.6.orig/Modules/readline.c python-2.7.6/Modules/readline.c
---- python-2.7.6.orig/Modules/readline.c	2014-04-16 13:40:17.566874715 -0700
-+++ python-2.7.6/Modules/readline.c	2014-04-16 13:37:15.421231983 -0700
-@@ -911,12 +911,12 @@ setup_readline(void)
-     rl_bind_key_in_map ('\t', rl_complete, emacs_meta_keymap);
-     rl_bind_key_in_map ('\033', rl_complete, emacs_meta_keymap);
-     /* Set our hook functions */
--    rl_startup_hook = (Function *)on_startup_hook;
-+    rl_startup_hook = on_startup_hook;
- #ifdef HAVE_RL_PRE_INPUT_HOOK
--    rl_pre_input_hook = (Function *)on_pre_input_hook;
-+    rl_pre_input_hook = on_pre_input_hook;
- #endif
-     /* Set our completion function */
--    rl_attempted_completion_function = (CPPFunction *)flex_complete;
-+    rl_attempted_completion_function = flex_complete;
-     /* Set Python word break characters */
-     completer_word_break_characters =
-         rl_completer_word_break_characters =
package/python/python-100-optional-test-modules.patch +15 -10
index a5f7545..ff9c914 100644
@@ -15,16 +15,17 @@ Index: b/Makefile.pre.in
 ===================================================================
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -934,23 +934,40 @@
+@@ -928,26 +928,42 @@
  	plat-mac/lib-scriptpackages/SystemEvents \
  	plat-mac/lib-scriptpackages/Terminal
  PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages
 -LIBSUBDIRS=	lib-tk lib-tk/test lib-tk/test/test_tkinter \
 -		lib-tk/test/test_ttk site-packages test test/audiodata test/data \
--		test/cjkencodings test/decimaltestdata test/xmltestdata test/subprocessdata \
+-		test/cjkencodings test/decimaltestdata test/xmltestdata \
+-		test/imghdrdata \
+-		test/subprocessdata \
 -		test/tracedmodules \
-+LIBSUBDIRS=	lib-tk \
-+		site-packages \
++LIBSUBDIRS=	lib-tk site-packages \
  		encodings compiler hotshot \
 -		email email/mime email/test email/test/data \
 -		json json/tests \
@@ -32,14 +33,16 @@ Index: b/Makefile.pre.in
 -		logging bsddb bsddb/test csv importlib wsgiref \
 -		lib2to3 lib2to3/fixes lib2to3/pgen2 lib2to3/tests \
 -		lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \
--		ctypes ctypes/test ctypes/macholib idlelib idlelib/Icons \
+-		ctypes ctypes/test ctypes/macholib \
+-		idlelib idlelib/Icons idlelib/idle_test \
 -		distutils distutils/command distutils/tests $(XMLLIBSUBDIRS) \
 +		email email/mime \
 +		json \
 +		sqlite3 \
 +		logging bsddb csv importlib wsgiref \
 +		lib2to3 lib2to3/fixes lib2to3/pgen2 \
-+		ctypes  ctypes/macholib idlelib idlelib/Icons \
++		ctypes ctypes/macholib \
++		idlelib idlelib/Icons \
 +		distutils distutils/command $(XMLLIBSUBDIRS) \
  		multiprocessing multiprocessing/dummy \
 -		unittest unittest/test \
@@ -48,9 +51,10 @@ Index: b/Makefile.pre.in
  		curses pydoc_data $(MACHDEPS)
 +
 +TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \
-+	lib-tk/test/test_ttk \
-+	test test/audiodata test/data \
-+	test/cjkencodings test/decimaltestdata test/xmltestdata test/subprocessdata \
++	lib-tk/test/test_ttk test test/audiodata test/data \
++	test/cjkencodings test/decimaltestdata test/xmltestdata \
++	test/imghdrdata \
++	test/subprocessdata \
 +	test/tracedmodules \
 +	email/test email/test/data \
 +	json/tests \
@@ -59,6 +63,7 @@ Index: b/Makefile.pre.in
 +	lib2to3/tests \
 +	lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \
 +	ctypes/test \
++	idlelib/idle_test \
 +	distutils/tests \
 +	unittest/test
 +
@@ -73,7 +78,7 @@ Index: b/configure.ac
 ===================================================================
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2614,6 +2614,12 @@
+@@ -2612,6 +2612,12 @@
  fi
  
  
package/python/python-101-optional-pydoc.patch +6 -6
index c9b05bd..7518b5e 100644
@@ -16,7 +16,7 @@ Index: b/Makefile.pre.in
 ===================================================================
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -947,7 +947,7 @@
+@@ -941,7 +941,7 @@
  		multiprocessing multiprocessing/dummy \
  		unittest \
  		lib-old \
@@ -24,8 +24,8 @@ Index: b/Makefile.pre.in
 +		curses $(MACHDEPS)
  
  TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \
- 	lib-tk/test/test_ttk \
-@@ -968,6 +968,10 @@
+ 	lib-tk/test/test_ttk test test/audiodata test/data \
+@@ -964,6 +964,10 @@
  LIBSUBDIRS += $(TESTSUBDIRS)
  endif
  
@@ -40,7 +40,7 @@ Index: b/configure.ac
 ===================================================================
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2613,6 +2613,11 @@
+@@ -2611,6 +2611,11 @@
        AC_CHECK_FUNCS(pthread_atfork)
  fi
  
@@ -56,7 +56,7 @@ Index: b/setup.py
 ===================================================================
 --- a/setup.py
 +++ b/setup.py
-@@ -2205,6 +2205,12 @@
+@@ -2217,6 +2217,12 @@
      # turn off warnings when deprecated modules are imported
      import warnings
      warnings.filterwarnings("ignore",category=DeprecationWarning)
@@ -69,7 +69,7 @@ Index: b/setup.py
      setup(# PyPI Metadata (PEP 301)
            name = "Python",
            version = sys.version.split()[0],
-@@ -2225,9 +2231,7 @@
+@@ -2237,9 +2243,7 @@
            ext_modules=[Extension('_struct', ['_struct.c'])],
  
            # Scripts to install
package/python/python-102-optional-2to3.patch +8 -8
index 586b24b..3503f8c 100644
@@ -16,24 +16,24 @@ Index: b/Makefile.pre.in
 ===================================================================
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -941,7 +941,6 @@
+@@ -934,7 +934,6 @@
  		json \
  		sqlite3 \
  		logging bsddb csv importlib wsgiref \
 -		lib2to3 lib2to3/fixes lib2to3/pgen2 \
- 		ctypes  ctypes/macholib idlelib idlelib/Icons \
+ 		ctypes ctypes/macholib \
+ 		idlelib idlelib/Icons \
  		distutils distutils/command $(XMLLIBSUBDIRS) \
- 		multiprocessing multiprocessing/dummy \
-@@ -958,8 +957,6 @@
+@@ -953,8 +952,6 @@
  	json/tests \
  	sqlite3/test \
  	bsddb/test \
 -	lib2to3/tests \
 -	lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \
  	ctypes/test \
+ 	idlelib/idle_test \
  	distutils/tests \
- 	unittest/test
-@@ -972,6 +969,14 @@
+@@ -968,6 +965,14 @@
  LIBSUBDIRS += pydoc_data
  endif
  
@@ -52,7 +52,7 @@ Index: b/configure.ac
 ===================================================================
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2625,6 +2625,12 @@
+@@ -2623,6 +2623,12 @@
  	AS_HELP_STRING([--disable-test-modules], [disable test modules]),
  	[ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ])
  
@@ -69,7 +69,7 @@ Index: b/setup.py
 ===================================================================
 --- a/setup.py
 +++ b/setup.py
-@@ -2206,10 +2206,11 @@
+@@ -2218,10 +2218,11 @@
      import warnings
      warnings.filterwarnings("ignore",category=DeprecationWarning)
  
package/python/python-103-optional-sqlite.patch +7 -7
index a20afc7..a75acc8 100644
@@ -12,7 +12,7 @@ Index: b/configure.ac
 ===================================================================
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2613,6 +2613,15 @@
+@@ -2611,6 +2611,15 @@
        AC_CHECK_FUNCS(pthread_atfork)
  fi
  
@@ -32,23 +32,23 @@ Index: b/Makefile.pre.in
 ===================================================================
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -939,7 +939,6 @@
+@@ -932,7 +932,6 @@
  		encodings compiler hotshot \
  		email email/mime \
  		json \
 -		sqlite3 \
  		logging bsddb csv importlib wsgiref \
- 		ctypes  ctypes/macholib idlelib idlelib/Icons \
- 		distutils distutils/command $(XMLLIBSUBDIRS) \
-@@ -955,7 +954,6 @@
+ 		ctypes ctypes/macholib \
+ 		idlelib idlelib/Icons \
+@@ -950,7 +949,6 @@
  	test/tracedmodules \
  	email/test email/test/data \
  	json/tests \
 -	sqlite3/test \
  	bsddb/test \
  	ctypes/test \
- 	distutils/tests \
-@@ -977,6 +975,11 @@
+ 	idlelib/idle_test \
+@@ -973,6 +971,11 @@
  		lib2to3/tests/data/fixers/myfixes
  endif
  
package/python/python-104-optional-tk.patch +9 -11
index 3e0dd16..2e469ab 100644
@@ -12,28 +12,26 @@ Index: b/Makefile.pre.in
 ===================================================================
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -934,8 +934,7 @@
+@@ -928,7 +928,7 @@
  	plat-mac/lib-scriptpackages/SystemEvents \
  	plat-mac/lib-scriptpackages/Terminal
  PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages
--LIBSUBDIRS=	lib-tk \
--		site-packages \
+-LIBSUBDIRS=	lib-tk site-packages \
 +LIBSUBDIRS=	site-packages \
  		encodings compiler hotshot \
  		email email/mime \
  		json \
-@@ -947,9 +946,7 @@
+@@ -941,8 +941,7 @@
  		lib-old \
  		curses $(MACHDEPS)
  
 -TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \
--	lib-tk/test/test_ttk \
--	test test/audiodata test/data \
+-	lib-tk/test/test_ttk test test/audiodata test/data \
 +TESTSUBDIRS = test test/audiodata test/data \
- 	test/cjkencodings test/decimaltestdata test/xmltestdata test/subprocessdata \
- 	test/tracedmodules \
- 	email/test email/test/data \
-@@ -980,6 +977,12 @@
+ 	test/cjkencodings test/decimaltestdata test/xmltestdata \
+ 	test/imghdrdata \
+ 	test/subprocessdata \
+@@ -976,6 +975,12 @@
  TESTSUBDIRS += sqlite3/test
  endif
  
@@ -50,7 +48,7 @@ Index: b/configure.ac
 ===================================================================
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2622,6 +2622,15 @@
+@@ -2620,6 +2620,15 @@
     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
  fi
  
package/python/python-105-optional-curses.patch +4 -4
index 2ae4989..384cad3 100644
@@ -12,7 +12,7 @@ Index: b/Makefile.pre.in
 ===================================================================
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -944,7 +944,7 @@
+@@ -939,7 +939,7 @@
  		multiprocessing multiprocessing/dummy \
  		unittest \
  		lib-old \
@@ -20,8 +20,8 @@ Index: b/Makefile.pre.in
 +		$(MACHDEPS)
  
  TESTSUBDIRS = test test/audiodata test/data \
- 	test/cjkencodings test/decimaltestdata test/xmltestdata test/subprocessdata \
-@@ -983,6 +983,10 @@
+ 	test/cjkencodings test/decimaltestdata test/xmltestdata \
+@@ -981,6 +981,10 @@
  	      lib-tk/test/test_ttk
  endif
  
@@ -36,7 +36,7 @@ Index: b/configure.ac
 ===================================================================
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2631,6 +2631,15 @@
+@@ -2629,6 +2629,15 @@
     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter"
  fi
  
package/python/python-106-optional-expat.patch +6 -6
index 9eee2cd..c1de887 100644
@@ -19,16 +19,16 @@ Index: b/Makefile.pre.in
 ===================================================================
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -940,7 +940,7 @@
- 		json \
+@@ -935,7 +935,7 @@
  		logging bsddb csv importlib wsgiref \
- 		ctypes  ctypes/macholib idlelib idlelib/Icons \
+ 		ctypes ctypes/macholib \
+ 		idlelib idlelib/Icons \
 -		distutils distutils/command $(XMLLIBSUBDIRS) \
 +		distutils distutils/command \
  		multiprocessing multiprocessing/dummy \
  		unittest \
  		lib-old \
-@@ -987,6 +987,10 @@
+@@ -985,6 +985,10 @@
  LIBSUBDIRS += curses
  endif
  
@@ -43,7 +43,7 @@ Index: b/configure.ac
 ===================================================================
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2278,13 +2278,21 @@
+@@ -2276,13 +2276,21 @@
  AC_SUBST(DISABLED_EXTENSIONS)
  
  # Check for use of the system expat library
@@ -74,7 +74,7 @@ Index: b/setup.py
 ===================================================================
 --- a/setup.py
 +++ b/setup.py
-@@ -1457,7 +1457,7 @@
+@@ -1469,7 +1469,7 @@
          #
          # More information on Expat can be found at www.libexpat.org.
          #
package/python/python-107-optional-codecs-cjk.patch +1 -1
index 1b3acac..ad1d41f 100644
@@ -10,7 +10,7 @@ Index: b/configure.ac
 ===================================================================
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2630,6 +2630,12 @@
+@@ -2628,6 +2628,12 @@
     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
  fi
  
package/python/python-108-optional-nis.patch +1 -1
index 8749dfc..bac49ff 100644
@@ -13,7 +13,7 @@ Index: b/configure.ac
 ===================================================================
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2636,6 +2636,12 @@
+@@ -2634,6 +2634,12 @@
      	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk"
    	  fi])
  
package/python/python-109-optional-unicodedata.patch +1 -1
index 2d78818..af9a28e 100644
@@ -10,7 +10,7 @@ Index: b/configure.ac
 ===================================================================
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2642,6 +2642,12 @@
+@@ -2640,6 +2640,12 @@
      	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
    	  fi])
  
package/python/python-110-optional-db.patch +7 -7
index a3e5fe8..ff1979e 100644
@@ -16,24 +16,24 @@ Index: b/Makefile.pre.in
 ===================================================================
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -938,7 +938,7 @@
+@@ -932,7 +932,7 @@
  		encodings compiler hotshot \
  		email email/mime \
  		json \
 -		logging bsddb csv importlib wsgiref \
 +		logging csv importlib wsgiref \
- 		ctypes  ctypes/macholib idlelib idlelib/Icons \
+ 		ctypes ctypes/macholib \
+ 		idlelib idlelib/Icons \
  		distutils distutils/command \
- 		multiprocessing multiprocessing/dummy \
-@@ -951,7 +951,6 @@
+@@ -948,7 +948,6 @@
  	test/tracedmodules \
  	email/test email/test/data \
  	json/tests \
 -	bsddb/test \
  	ctypes/test \
+ 	idlelib/idle_test \
  	distutils/tests \
- 	unittest/test
-@@ -991,6 +990,11 @@
+@@ -989,6 +988,11 @@
  LIBSUBDIRS += $(XMLLIBSUBDIRS)
  endif
  
@@ -49,7 +49,7 @@ Index: b/configure.ac
 ===================================================================
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2642,6 +2642,28 @@
+@@ -2640,6 +2640,28 @@
      	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
    	  fi])
  
package/python/python-111-optional-ssl.patch +1 -1
index 8d4599d..cde6bb6 100644
@@ -10,7 +10,7 @@ Index: b/configure.ac
 ===================================================================
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2642,6 +2642,12 @@
+@@ -2640,6 +2640,12 @@
      	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
    	  fi])
  
package/python/python-112-optional-bzip2.patch +1 -1
index ba7dbaa..1b139bf 100644
@@ -9,7 +9,7 @@ Index: b/configure.ac
 ===================================================================
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2648,6 +2648,12 @@
+@@ -2646,6 +2646,12 @@
      	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl"
    	  fi])
  
package/python/python-113-optional-zlib.patch +1 -1
index 19f100b..e98265f 100644
@@ -9,7 +9,7 @@ Index: b/configure.ac
 ===================================================================
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2654,6 +2654,12 @@
+@@ -2652,6 +2652,12 @@
              DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} bz2"
           fi])
  
package/python/python.mk +1 -1
index 8a2ba65..c005712 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 PYTHON_VERSION_MAJOR = 2.7
-PYTHON_VERSION       = $(PYTHON_VERSION_MAJOR).6
+PYTHON_VERSION       = $(PYTHON_VERSION_MAJOR).7
 PYTHON_SOURCE        = Python-$(PYTHON_VERSION).tar.xz
 PYTHON_SITE          = http://python.org/ftp/python/$(PYTHON_VERSION)
 PYTHON_LICENSE       = Python software foundation license v2, others
Signature · 1 line
2.0.0
#4 lore raw

PATCH 4/5 python: do not install the IDLE editor

In reply to Thomas Petazzoni

IDLE is the Python IDE built with the tkinter GUI toolkit, for which the main script has always been removed from the target (so it was never usable in Buildroot). However, we were still installing about 800 to 900 KB of .pyc files used only by the idle editor. This commit adds a Python patch that completely gets rid of the compilation/installation of the idle editor. As a consequence, it is no longer needed to manually remove the 'idle' program from the target in python.mk.

---
 package/python/python-114-remove-idle-editor.patch | 43 ++++++++++++++++++++++
 package/python/python.mk                           |  1 -
 2 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 package/python/python-114-remove-idle-editor.patch
package/python/python-114-remove-idle-editor.patch new file +43 -0
new file mode 100644
index 0000000..0f73677
@@ -0,0 +1,43 @@
+Do not install the idle editor
+
+IDLE is the Python IDE built with the tkinter GUI toolkit. Since it's
+highly unlikely to ever be useful in an embedded Linux system
+generated by Buildroot, this patch simply disables the installation of
+idle and the related Python modules. It saves 800 KB-900 KB of
+installed .pyc files.
+
+Signed-off-by: Thomas Petazzoni <[email protected]>
+
+Index: b/Makefile.pre.in
+===================================================================
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -934,7 +934,6 @@
+ 		json \
+ 		logging csv importlib wsgiref \
+ 		ctypes ctypes/macholib \
+-		idlelib idlelib/Icons \
+ 		distutils distutils/command \
+ 		multiprocessing multiprocessing/dummy \
+ 		unittest \
+@@ -949,7 +948,6 @@
+ 	email/test email/test/data \
+ 	json/tests \
+ 	ctypes/test \
+-	idlelib/idle_test \
+ 	distutils/tests \
+ 	unittest/test
+ 
+Index: b/setup.py
+===================================================================
+--- a/setup.py
++++ b/setup.py
+@@ -2218,7 +2218,7 @@
+     import warnings
+     warnings.filterwarnings("ignore",category=DeprecationWarning)
+ 
+-    scripts = ['Tools/scripts/idle', 'Lib/smtpd.py']
++    scripts = ['Lib/smtpd.py']
+     if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"):
+         scripts += [ 'Tools/scripts/pydoc' ]
+     if not '--disable-lib2to3' in sysconfig.get_config_var("CONFIG_ARGS"):
package/python/python.mk +0 -1
index c005712..532e120 100644
@@ -153,7 +153,6 @@ PYTHON_POST_PATCH_HOOKS += PYTHON_TOUCH_GRAMMAR_FILES
 # idle & smtpd.py have bad shebangs and are mostly samples
 #
 define PYTHON_REMOVE_USELESS_FILES
-	rm -f $(TARGET_DIR)/usr/bin/idle
 	rm -f $(TARGET_DIR)/usr/bin/python$(PYTHON_VERSION_MAJOR)-config
 	rm -f $(TARGET_DIR)/usr/bin/python2-config
 	rm -f $(TARGET_DIR)/usr/bin/python-config
Signature · 1 line
2.0.0
#5 lore raw

PATCH 5/5 gettext: remove useless ABOUT-NLS file

In reply to Thomas Petazzoni

For some reason, gettext installs on the target a documentation file named ABOUT-NLS in /usr/share/gettext, that is clearly not needed for the proper execution of programs. This commit adds a post-install hook in gettext.mk to get rid of this file.

---
 package/gettext/gettext.mk | 7 +++++++
 1 file changed, 7 insertions(+)
package/gettext/gettext.mk +7 -0
index 948ab9d..cc461f7 100644
@@ -50,6 +50,13 @@ endef
 GETTEXT_POST_PATCH_HOOKS += HOST_GETTEXT_DISABLE_UNNEEDED
 HOST_GETTEXT_POST_PATCH_HOOKS += HOST_GETTEXT_DISABLE_UNNEEDED
 
+define GETTEXT_REMOVE_UNNEEDED
+	$(RM) -rf $(TARGET_DIR)/usr/share/gettext/ABOUT-NLS
+	rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share/gettext
+endef
+
+GETTEXT_POST_INSTALL_TARGET_HOOKS += GETTEXT_REMOVE_UNNEEDED
+
 # Force build with NLS support, otherwise libintl is not built
 # This is needed because some packages (eg. libglib2) requires
 # locales, but do not properly depend on BR2_ENABLE_LOCALE, and
Signature · 1 line
2.0.0
#6 lore raw

cover Misc updates: libffi, python, gettext

In reply to Thomas Petazzoni
Quoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Hello,
This set of patches bump libffi to version 3.1, and Python to version 2.7.7, and does a number of small related updates.

Committed all 5, thanks.

Signature · 1 line
Bye, Peter Korsgaard