diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-31 10:49:10 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-31 10:49:10 +0100 |
| commit | c3d862d97a22f8cdd535051688ef24f8bd3adfc4 (patch) | |
| tree | 4f3961ed1e05f8277e77deaa9b708d20962aa3b9 | |
| parent | e85afc45db93d7c66b63dd1e64189fad71d62080 (diff) | |
| parent | 5e1af1d22d4e680d1b5f5486df023a2f0ddb9c9c (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | mk/buildhlp.mk | 4 | ||||
| -rw-r--r-- | package/python2/Makefile | 2 | ||||
| -rw-r--r-- | package/python2/patches/patch-Misc_python-config_in | 12 |
3 files changed, 13 insertions, 5 deletions
diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk index 79014ac4b..587a97125 100644 --- a/mk/buildhlp.mk +++ b/mk/buildhlp.mk @@ -96,8 +96,8 @@ endif @-test ! -r ${WRKDIR}/.autoreconf_done || \ (wrkdist=$(WRKDIST) dir=$${wrkdist#$(WRKDIR)}; \ cd ${WRKDIR}.orig$${dir}; \ - env ${AUTOTOOL_ENV} autoreconf -if) $(MAKE_TRACE) - @rm -rf ${WRKDIR}.orig/${PKG_NAME}-${PKG_VERSION}/autom4te.cache + env ${AUTOTOOL_ENV} autoreconf -if; \ + rm -rf ${WRKDIR}.orig$${dir}/autom4te.cache ) $(MAKE_TRACE) @# restore config.sub/config.guess @for i in $$(find ${WRKDIR} -name config.sub);do \ if [ -f $$i.bak ];then \ diff --git a/package/python2/Makefile b/package/python2/Makefile index 82c89c433..ad4b4d781 100644 --- a/package/python2/Makefile +++ b/package/python2/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= python2 PKG_VERSION:= 2.7.5 -PKG_RELEASE:= 3 +PKG_RELEASE:= 4 PKG_MD5SUM:= b4f01a1d0ba0b46b05c73b2ac909b1df PKG_DESCR:= Python scripting language (Version 2) PKG_SECTION:= lang diff --git a/package/python2/patches/patch-Misc_python-config_in b/package/python2/patches/patch-Misc_python-config_in index 7ea806bea..9734d4fbd 100644 --- a/package/python2/patches/patch-Misc_python-config_in +++ b/package/python2/patches/patch-Misc_python-config_in @@ -1,6 +1,14 @@ --- Python-2.7.5.orig/Misc/python-config.in 2013-05-12 05:32:49.000000000 +0200 -+++ Python-2.7.5/Misc/python-config.in 2013-10-30 21:09:36.000000000 +0100 -@@ -37,8 +37,8 @@ for opt in opt_flags: ++++ Python-2.7.5/Misc/python-config.in 2013-10-30 21:29:47.000000000 +0100 +@@ -3,6 +3,7 @@ + import sys + import os + import getopt ++import re + from distutils import sysconfig + + valid_opts = ['prefix', 'exec-prefix', 'includes', 'libs', 'cflags', +@@ -37,8 +38,8 @@ for opt in opt_flags: print sysconfig.EXEC_PREFIX elif opt in ('--includes', '--cflags'): |