Browse Source

forgot to import regular expression module

Waldemar Brodkorb 10 years ago
parent
commit
b520d5c344
3 changed files with 13 additions and 5 deletions
  1. 2 2
      mk/buildhlp.mk
  2. 1 1
      package/python2/Makefile
  3. 10 2
      package/python2/patches/patch-Misc_python-config_in

+ 2 - 2
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 \

+ 1 - 1
package/python2/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		python2
 PKG_VERSION:=		2.7.5
-PKG_RELEASE:=		3
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		b4f01a1d0ba0b46b05c73b2ac909b1df
 PKG_DESCR:=		Python scripting language (Version 2)
 PKG_SECTION:=		lang

+ 10 - 2
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'):