summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2013-10-30 15:48:23 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2013-10-30 15:48:23 +0100
commite42384d8e9357974ac550904060900f144b3ffad (patch)
treeec90bff0aa4da5e451293a7d9bfad715e2f78066
parent5ce633839096d25a684af6978ba9da7d6d34fdaf (diff)
parent25d3b3e61bc2a9fd759fd1a5ff6aa64076b4151d (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
-rw-r--r--package/openssl/Makefile2
-rw-r--r--package/python2/Makefile7
-rw-r--r--package/python2/patches/patch-Makefile_pre_in2
-rw-r--r--package/python2/patches/patch-setup_py38
-rw-r--r--package/python3/Makefile2
5 files changed, 41 insertions, 10 deletions
diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index 7a7088350..a41525ded 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -57,7 +57,7 @@ post-extract:
do-configure:
(cd $(WRKBUILD); \
- PATH=$(TARGET_PATH) \
+ PATH='$(TARGET_PATH)' \
OPTIMIZATION_FLAGS="$(TARGET_CFLAGS) -fPIC" \
./Configure $(CONFIG) \
--prefix=/usr \
diff --git a/package/python2/Makefile b/package/python2/Makefile
index fdf39f45f..c0678a528 100644
--- a/package/python2/Makefile
+++ b/package/python2/Makefile
@@ -5,11 +5,11 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= python2
PKG_VERSION:= 2.7.5
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= b4f01a1d0ba0b46b05c73b2ac909b1df
PKG_DESCR:= Python scripting language (Version 2)
PKG_SECTION:= lang
-PKG_BUILDDEP:= libffi python2-host
+PKG_BUILDDEP:= libffi python2-host autotool
PKG_DEPENDS:= libpthread libffi libgcc
PKG_URL:= http://www.python.org/
PKG_SITES:= http://www.python.org/ftp/python/${PKG_VERSION}/
@@ -84,6 +84,7 @@ $(eval $(call PKG_mod_template,PYTHON2_MOD_NCURSES,_curses))
$(eval $(call PKG_mod_template,PYTHON2_MOD_SSL,_ssl))
$(eval $(call PKG_mod_template,PYTHON2_MOD_READLINE,readline))
+AUTOTOOL_STYLE:= autoreconf
MAKE_ENV+= HOSTPGEN=$(STAGING_HOST_DIR)/usr/bin/pgen
CONFIGURE_ENV+= ac_cv_have_long_long_format=yes \
ac_cv_file__dev_ptmx=yes \
@@ -118,7 +119,7 @@ python2-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m}
${CP} ${WRKINST}/usr/lib/python2.7/* ${IDIR_PYTHON2}/usr/lib/python2.7
${CP} ${WRKINST}/usr/include/python2.7/pyconfig.h \
${IDIR_PYTHON2}/usr/include/python2.7
- for i in zlib bz2 _curses _ssl gdbm _sqlite pyexpat readline; do \
+ @-for i in zlib bz2 _curses _ssl gdbm _sqlite pyexpat readline; do \
rm ${IDIR_PYTHON2}/usr/lib/python2.7/lib-dynload/$${i}*so; \
done
diff --git a/package/python2/patches/patch-Makefile_pre_in b/package/python2/patches/patch-Makefile_pre_in
index e4f59f0ba..8c6aba5c2 100644
--- a/package/python2/patches/patch-Makefile_pre_in
+++ b/package/python2/patches/patch-Makefile_pre_in
@@ -1,5 +1,5 @@
--- Python-2.7.5.orig/Makefile.pre.in 2013-05-12 05:32:49.000000000 +0200
-+++ Python-2.7.5/Makefile.pre.in 2013-10-29 08:12:25.000000000 +0100
++++ Python-2.7.5/Makefile.pre.in 2013-10-30 14:10:07.000000000 +0100
@@ -227,6 +227,7 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@
##########################################################################
# Parser
diff --git a/package/python2/patches/patch-setup_py b/package/python2/patches/patch-setup_py
index f8f2fa1c0..0cb811de9 100644
--- a/package/python2/patches/patch-setup_py
+++ b/package/python2/patches/patch-setup_py
@@ -1,5 +1,5 @@
--- Python-2.7.5.orig/setup.py 2013-05-12 05:32:54.000000000 +0200
-+++ Python-2.7.5/setup.py 2013-10-29 07:33:37.000000000 +0100
++++ Python-2.7.5/setup.py 2013-10-30 14:18:23.000000000 +0100
@@ -74,7 +74,7 @@ def find_file(filename, std_dirs, paths)
'paths' is a list of additional locations to check; if the file is
found in one of them, the resulting list will contain the directory.
@@ -54,7 +54,23 @@
if os.path.join(sysroot, p[1:]) == dirname:
return [ p ]
-@@ -437,10 +437,12 @@ class PyBuildExt(build_ext):
+@@ -162,6 +162,7 @@ class PyBuildExt(build_ext):
+
+ def build_extensions(self):
+
++ self.compiler.library_dirs = []
+ # Detect which modules should be compiled
+ missing = self.detect_modules()
+
+@@ -281,6 +282,7 @@ class PyBuildExt(build_ext):
+
+ def build_extension(self, ext):
+
++
+ if ext.name == '_ctypes':
+ if not self.configure_ctypes(ext):
+ return
+@@ -437,10 +439,12 @@ class PyBuildExt(build_ext):
def detect_modules(self):
# Ensure that /usr/local is always used
@@ -70,7 +86,7 @@
# Add paths specified in the environment variables LDFLAGS and
# CPPFLAGS for header and library files.
-@@ -477,7 +479,8 @@ class PyBuildExt(build_ext):
+@@ -477,7 +481,8 @@ class PyBuildExt(build_ext):
add_dir_to_list(dir_list, directory)
if os.path.normpath(sys.prefix) != '/usr' \
@@ -80,7 +96,21 @@
# OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework
# (PYTHONFRAMEWORK is set) to avoid # linking problems when
# building a framework with different architectures than
-@@ -530,7 +533,7 @@ class PyBuildExt(build_ext):
+@@ -495,8 +500,13 @@ 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.
++ if cross_compiling:
++ add_dir_to_list(self.compiler.library_dirs,
++ sysconfig.get_config_var('srcdir'))
++
+ inc_dirs = self.compiler.include_dirs[:]
+ lib_dirs = self.compiler.library_dirs[:]
++
+ if not cross_compiling:
+ for d in (
+ '/usr/include',
+@@ -530,7 +540,7 @@ class PyBuildExt(build_ext):
if host_platform == 'hp-ux11':
lib_dirs += ['/usr/lib/hpux64', '/usr/lib/hpux32']
diff --git a/package/python3/Makefile b/package/python3/Makefile
index c18423290..40659bff4 100644
--- a/package/python3/Makefile
+++ b/package/python3/Makefile
@@ -115,7 +115,7 @@ python3-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m}
${CP} ${WRKINST}/usr/lib/python3.3/* ${IDIR_PYTHON3}/usr/lib/python3.3
${CP} ${WRKINST}/usr/include/python3.3m/pyconfig.h \
${IDIR_PYTHON3}/usr/include/python3.3m
- for i in zlib _bz2 _curses _ssl _gdbm _sqlite pyexpat readline; do \
+ @-for i in zlib _bz2 _curses _ssl _gdbm _sqlite pyexpat readline; do \
rm ${IDIR_PYTHON3}/usr/lib/python3.3/lib-dynload/$${i}*so; \
done