diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-12 19:07:20 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-12 19:07:20 +0100 |
| commit | 0eae06e5fb400328ae0956aafffcf1b5082c9a15 (patch) | |
| tree | 7686152246bf0afcdb4696593c5f9a1559e834ea /package/python2 | |
| parent | 917da64a3d68249942cb842dbd9e5504d72f9989 (diff) | |
fix cross-compile under Darwin
Diffstat (limited to 'package/python2')
| -rw-r--r-- | package/python2/Makefile | 10 | ||||
| -rw-r--r-- | package/python2/files/python-config.in | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/package/python2/Makefile b/package/python2/Makefile index ae88d5ade..dc9092dd9 100644 --- a/package/python2/Makefile +++ b/package/python2/Makefile @@ -40,12 +40,12 @@ post-extract: (cd ${WRKBUILD}; rm -rf config.{cache,status} ; \ OPT="$(HOSTCFLAGS)" \ ./configure --without-cxx-main --without-threads \ - --prefix=$(STAGING_HOST_DIR) \ + --prefix=$(STAGING_HOST_DIR)/usr \ ); $(MAKE) -C ${WRKBUILD} python Parser/pgen $(MAKE) -C ${WRKBUILD} install - ${CP} ${WRKBUILD}/Parser/pgen ${STAGING_HOST_DIR}/bin/pgen - ${CP} ${WRKBUILD}/python ${STAGING_HOST_DIR}/bin/hostpython + ${CP} ${WRKBUILD}/Parser/pgen ${STAGING_HOST_DIR}/usr/bin/pgen + ${CP} ${WRKBUILD}/python ${STAGING_HOST_DIR}/usr/bin/hostpython ${CP} ${WRKBUILD}/Parser/pgen ${WRKBUILD}/Parser/hostpgen ${CP} ${WRKBUILD}/python ${WRKBUILD}/hostpython $(MAKE) -C ${WRKBUILD} clean @@ -63,7 +63,7 @@ post-install: ${CP} ${WRKINST}/usr/include/python2.7/* ${IDIR_PYTHON2}/usr/include/python2.7 -find ${IDIR_PYTHON2} -name "\*.pyc" -o -name "*\.pyo" -exec rm {} \; # workaround, copy host python-config to target scripts directory - ${CP} ${STAGING_HOST_DIR}/bin/python*-config ${STAGING_TARGET_DIR}/scripts - ${CP} ${STAGING_HOST_DIR}/bin/python*-config ${STAGING_TARGET_DIR}/usr/bin + ${CP} ${STAGING_HOST_DIR}/usr/bin/python*-config ${STAGING_TARGET_DIR}/scripts + ${CP} ${STAGING_HOST_DIR}/usr/bin/python*-config ${STAGING_TARGET_DIR}/usr/bin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/python2/files/python-config.in b/package/python2/files/python-config.in index 8419bd84a..0074d0304 100644 --- a/package/python2/files/python-config.in +++ b/package/python2/files/python-config.in @@ -38,8 +38,8 @@ for opt in opt_flags: print sysconfig.EXEC_PREFIX elif opt in ('--includes', '--cflags'): - flags = ['-I' + re.sub('host/', 'target/usr/', sysconfig.get_python_inc()), - '-I' + re.sub('host/', 'target/usr/', sysconfig.get_python_inc(plat_specific=True))] + flags = ['-I' + re.sub('host_', 'target_', sysconfig.get_python_inc()), + '-I' + re.sub('host_', 'target_', sysconfig.get_python_inc(plat_specific=True))] if opt == '--cflags': flags.extend(getvar('CFLAGS').split()) print ' '.join(flags) |