From f53612bc7414c0d9e4700f957d6a1a1742574c67 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 28 Sep 2009 19:46:42 +0200 Subject: fix cross-compile at least from x86 to x86_64 --- package/python/Makefile | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'package/python/Makefile') diff --git a/package/python/Makefile b/package/python/Makefile index a602c6706..d80b3a05a 100644 --- a/package/python/Makefile +++ b/package/python/Makefile @@ -15,18 +15,20 @@ PKG_SITES:= http://www.python.org/ftp/python/3.1.1/ DISTFILES= Python-${PKG_VERSION}.tgz WRKDIST= ${WRKDIR}/Python-${PKG_VERSION} +DISMOD:= readline _curses _curses_panel _tkinter nis + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,PYTHON,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) MAKE_ENV+= OPT="$(TARGET_CFLAGS)" \ - HOSTPYTHON=hostpython \ - HOSTPGEN=hostpgen \ - CROSS_COMPILE=yes + HOSTPYTHON=./hostpython \ + HOSTPGEN=./Parser/hostpgen \ + PYTHON_DISABLE_MODULES="$(DISMOD)" CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= OPT="$(TARGET_CFLAGS)" -CONFGIURE_ARGS:= --with-threads \ +CONFIGURE_ARGS:= --with-threads \ --with-system-ffi \ --without-cxx-main BUILD_STYLE:= auto @@ -39,10 +41,10 @@ pre-configure: --prefix=$(STAGING_TOOLS) \ ); $(MAKE) -C ${WRKBUILD} python Parser/pgen - ${CP} ${WRKBUILD}/Parser/pgen ${STAGING_TOOLS}/bin/hostpgen - ${CP} ${WRKBUILD}/python ${STAGING_TOOLS}/bin/hostpython - PATH='${TARGET_PATH}' \ - $(MAKE) -C ${WRKBUILD} HOSTPYTHON="hostpython" sharedmods install + ${CP} ${WRKBUILD}/Parser/pgen ${STAGING_TOOLS}/bin/pgen + ${CP} ${WRKBUILD}/python ${STAGING_TOOLS}/bin/python + ${CP} ${WRKBUILD}/Parser/pgen ${WRKBUILD}/Parser/hostpgen + ${CP} ${WRKBUILD}/python ${WRKBUILD}/hostpython $(MAKE) -C ${WRKBUILD} distclean post-install: -- cgit v1.2.3 From c111f14db1b4558ebf5b2e894315c8e5217bf6fc Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 22 Nov 2009 16:08:36 +0100 Subject: make bulk build on Debian/lenny x86 complete - fix some menu descriptions - fix gcc package compile --- package/python/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/python/Makefile') diff --git a/package/python/Makefile b/package/python/Makefile index d80b3a05a..7d087dd1d 100644 --- a/package/python/Makefile +++ b/package/python/Makefile @@ -42,7 +42,7 @@ pre-configure: ); $(MAKE) -C ${WRKBUILD} python Parser/pgen ${CP} ${WRKBUILD}/Parser/pgen ${STAGING_TOOLS}/bin/pgen - ${CP} ${WRKBUILD}/python ${STAGING_TOOLS}/bin/python + ${CP} ${WRKBUILD}/python ${STAGING_TOOLS}/bin/hostpython ${CP} ${WRKBUILD}/Parser/pgen ${WRKBUILD}/Parser/hostpgen ${CP} ${WRKBUILD}/python ${WRKBUILD}/hostpython $(MAKE) -C ${WRKBUILD} distclean -- cgit v1.2.3 From 6daa792eab1488d013fefc5eb7e4d01f40f38687 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 7 Feb 2010 20:03:20 +0100 Subject: change defaults for CONFIG/BUILD/INSTALL styles All packages need an update, so here is a very huge commit. Most of the 460 source packages use automatic style for configuration, building and installing. Make these styles default to "auto". If you have a package, which does not conform to this, just use manual style and add a do-$task make target. I added a new style named AUTOTOOL style, which is needed for some broken packages, which needs to be updated via autoconf or automake. I renamed CONFIGURE_STYLE to CONFIG_STYLE. Updates for some packages, which have newer upstream versions. Renaming of all package/*/extra directories. Use the directory src/ to provide overwrites of source files or to add the code, when no upstream package is available or used. src directory will be automatically used. --- package/python/Makefile | 4 ---- 1 file changed, 4 deletions(-) (limited to 'package/python/Makefile') diff --git a/package/python/Makefile b/package/python/Makefile index 7d087dd1d..7c313dcad 100644 --- a/package/python/Makefile +++ b/package/python/Makefile @@ -25,14 +25,10 @@ MAKE_ENV+= OPT="$(TARGET_CFLAGS)" \ HOSTPYTHON=./hostpython \ HOSTPGEN=./Parser/hostpgen \ PYTHON_DISABLE_MODULES="$(DISMOD)" - -CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= OPT="$(TARGET_CFLAGS)" CONFIGURE_ARGS:= --with-threads \ --with-system-ffi \ --without-cxx-main -BUILD_STYLE:= auto -INSTALL_STYLE:= auto pre-configure: (cd ${WRKBUILD}; rm -rf config.{cache,status} ; \ -- cgit v1.2.3 From 42675af37cb5ce735452311734cc5b88a66d6d9d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 14 Feb 2010 00:38:14 +0100 Subject: complete allmodconfig build on NetBSD --- package/python/Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'package/python/Makefile') diff --git a/package/python/Makefile b/package/python/Makefile index 7c313dcad..63d830e95 100644 --- a/package/python/Makefile +++ b/package/python/Makefile @@ -12,6 +12,8 @@ PKG_SECTION:= lang PKG_URL:= http://www.python.org PKG_SITES:= http://www.python.org/ftp/python/3.1.1/ +PKG_HOST_DEPENDS:= !netbsd + DISTFILES= Python-${PKG_VERSION}.tgz WRKDIST= ${WRKDIR}/Python-${PKG_VERSION} -- cgit v1.2.3 From d92e2d01cb8207ea3c388df103b288886a9626c7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 18 Feb 2010 19:06:45 +0100 Subject: Avoid/Fix build on OpenBSD host system --- package/python/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/python/Makefile') diff --git a/package/python/Makefile b/package/python/Makefile index 63d830e95..ad694d872 100644 --- a/package/python/Makefile +++ b/package/python/Makefile @@ -12,7 +12,7 @@ PKG_SECTION:= lang PKG_URL:= http://www.python.org PKG_SITES:= http://www.python.org/ftp/python/3.1.1/ -PKG_HOST_DEPENDS:= !netbsd +PKG_HOST_DEPENDS:= !netbsd !openbsd DISTFILES= Python-${PKG_VERSION}.tgz WRKDIST= ${WRKDIR}/Python-${PKG_VERSION} -- cgit v1.2.3