diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-07-11 16:27:03 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-07-11 16:27:03 +0200 |
| commit | 5235583ddb46ae51957c90ca38684fe60ae353b6 (patch) | |
| tree | c62cd39f5f9c9d57528f9a3a1804ccf8466878c5 /package | |
| parent | 3269b33600bf1feed258e74bcb26194494b78793 (diff) | |
| parent | ca208d49d8ff8a485cf7e3236b22069ab3440502 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package')
| -rw-r--r-- | package/python2/Makefile | 8 | ||||
| -rw-r--r-- | package/python2/patches/patch-Makefile_pre_in | 9 |
2 files changed, 13 insertions, 4 deletions
diff --git a/package/python2/Makefile b/package/python2/Makefile index 4c5b17c5e..075920912 100644 --- a/package/python2/Makefile +++ b/package/python2/Makefile @@ -15,7 +15,7 @@ PKG_URL:= http://www.python.org/ PKG_SITES:= http://www.python.org/ftp/python/${PKG_VERSION}/ PKG_OPTS:= noscripts -PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin +PKG_HOST_DEPENDS:= !netbsd !openbsd DISTFILES= Python-${PKG_VERSION}.tgz WRKDIST= ${WRKDIR}/Python-${PKG_VERSION} @@ -30,6 +30,10 @@ $(eval $(call PKG_template,PYTHON2,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${P $(eval $(call PKG_template,PYTHON2_BZIP2,${PKG_NAME}-bzip2,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_PYTHON2_BZIP2},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,PYTHON2_READLINE,${PKG_NAME}-readline,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_PYTHON2_READLINE},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +ifeq ($(ADK_HOST_CYGWIN),y) +EXE:= .exe +endif + TARGET_CFLAGS+= -fPIC TARGET_LDFLAGS+= -L. MAKE_ENV+= OPT="$(TARGET_CFLAGS)" \ @@ -55,7 +59,7 @@ post-extract: ./configure --without-cxx-main --with-threads \ --prefix=$(STAGING_HOST_DIR)/usr \ ); - $(MAKE) -C ${WRKBUILD} python Parser/pgen + $(MAKE) -C ${WRKBUILD} python$(EXE) Parser/pgen$(EXE) $(MAKE) -C ${WRKBUILD} install ${CP} ${WRKBUILD}/Parser/pgen ${STAGING_HOST_DIR}/usr/bin/pgen ${CP} ${WRKBUILD}/python ${STAGING_HOST_DIR}/usr/bin/hostpython diff --git a/package/python2/patches/patch-Makefile_pre_in b/package/python2/patches/patch-Makefile_pre_in index 694518173..f18bd9a72 100644 --- a/package/python2/patches/patch-Makefile_pre_in +++ b/package/python2/patches/patch-Makefile_pre_in @@ -1,6 +1,6 @@ diff -Nur Python-2.7.1.orig/Makefile.pre.in Python-2.7.1/Makefile.pre.in --- Python-2.7.1.orig/Makefile.pre.in 2010-10-14 13:37:30.000000000 +0200 -+++ Python-2.7.1/Makefile.pre.in 2011-10-15 16:09:58.000000000 +0200 ++++ Python-2.7.1/Makefile.pre.in 2013-07-11 11:56:32.128103200 +0200 @@ -59,7 +59,7 @@ MAKESETUP= $(srcdir)/Modules/makese # Compiler options OPT= @OPT@ @@ -113,7 +113,7 @@ diff -Nur Python-2.7.1.orig/Makefile.pre.in Python-2.7.1/Makefile.pre.in # Create the PLATDIR source directory, if one wasn't distributed.. $(srcdir)/Lib/$(PLATDIR): -@@ -1044,7 +1045,8 @@ libainstall: all python-config +@@ -1044,11 +1045,12 @@ libainstall: all python-config # Install the dynamically loadable modules # This goes into $(exec_prefix) sharedinstall: sharedmods @@ -123,6 +123,11 @@ diff -Nur Python-2.7.1.orig/Makefile.pre.in Python-2.7.1/Makefile.pre.in --prefix=$(prefix) \ --install-scripts=$(BINDIR) \ --install-platlib=$(DESTSHARED) \ +- --root=/$(DESTDIR) ++ --root=$(DESTDIR) + + # Here are a couple of targets for MacOSX again, to install a full + # framework-based Python. frameworkinstall installs everything, the @@ -1082,7 +1084,7 @@ frameworkinstallstructure: $(LDLIBRARY) fi; \ done |