summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mk/host-bottom.mk3
-rw-r--r--mk/python.mk2
-rw-r--r--package/libtool/Makefile4
-rw-r--r--package/libxml2/Makefile12
-rw-r--r--package/libxml2/patches/patch-configure42
-rw-r--r--package/libxml2/patches/patch-configure_in87
-rw-r--r--package/python2/Makefile14
-rw-r--r--package/python2/patches/patch-Misc_python-config_in13
-rw-r--r--package/python2/patches/patch-configure_ac22
-rw-r--r--package/xcb-proto/Makefile2
-rw-r--r--scripts/scan-pkgs.sh24
11 files changed, 136 insertions, 89 deletions
diff --git a/mk/host-bottom.mk b/mk/host-bottom.mk
index 83eb22b0e..ecab37775 100644
--- a/mk/host-bottom.mk
+++ b/mk/host-bottom.mk
@@ -79,7 +79,8 @@ endif
exec ${MAKE} host-extract $(MAKE_TRACE)
mkdir -p ${HOST_WRKINST}
# avoid rebuild
- touch ${_HOST_BUILD_COOKIE} ${_HOST_CONFIGURE_COOKIE}
+ touch ${_HOST_CONFIGURE_COOKIE}
+ touch ${_HOST_BUILD_COOKIE}
touch $@
${_HOST_COOKIE}:
diff --git a/mk/python.mk b/mk/python.mk
index 933bd0065..1ef92e664 100644
--- a/mk/python.mk
+++ b/mk/python.mk
@@ -1,7 +1,7 @@
PYTHON_VERSION=2.7
ifeq ($(ADK_NATIVE),)
PYTHON_LIBDIR:=$(STAGING_HOST_DIR)/usr/lib
-PYTHON:=${STAGING_HOST_DIR}/usr/bin/hostpython
+PYTHON:=${STAGING_HOST_DIR}/usr/bin/python
else
PYTHON_LIBDIR:=/usr/lib
PYTHON:=/usr/bin/python
diff --git a/package/libtool/Makefile b/package/libtool/Makefile
index c549264d4..08842b638 100644
--- a/package/libtool/Makefile
+++ b/package/libtool/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= libtool
PKG_VERSION:= 2.4.2
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= d2f3b7d4627e69e13514a40e72a24d50
PKG_DESCR:= a generic dynamic object loading library
PKG_SECTION:= lang
@@ -34,6 +34,8 @@ endif
HOST_STYLE:= auto
CONFIGURE_ARGS+= --enable-ltdl-install
+XAKE_FLAGS+= HELP2MAN=/bin/echo
+HOST_XAKE_FLAGS+= HELP2MAN=/bin/echo
libtool-install:
${INSTALL_DIR} ${IDIR_LIBTOOL}/usr/bin
diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile
index 6b48226e6..4d5577eb1 100644
--- a/package/libxml2/Makefile
+++ b/package/libxml2/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:= 9c0cfef285d5c4a5c80d00904ddab380
PKG_DESCR:= XML C parser and toolkit
PKG_SECTION:= libs
PKG_DEPENDS:= zlib
-PKG_BUILDDEP:= zlib
+PKG_BUILDDEP:= zlib autotool
PKG_URL:= http://www.xmlsoft.org/
PKG_SITES:= http://xmlsoft.org/sources/
PKG_OPTS:= dev
@@ -18,7 +18,7 @@ PKG_OPTS:= dev
PKG_SUBPKGS:= LIBXML2 LIBXML2_PYTHON
PKGSD_LIBXML2_PYTHON:= XML python bindings
PKGSC_LIBXML2_PYTHON:= libs
-PKGSB_LIBXML2_PYTHON:= python2
+PKGSB_LIBXML2_PYTHON:= python2-host
ifeq ($(ADK_STATIC),y)
PKG_OPTS+= libmix
@@ -31,10 +31,11 @@ $(eval $(call PKG_template,LIBXML2_PYTHON,libxml2-python,${PKG_VERSION}-${PKG_RE
include $(TOPDIR)/mk/python.mk
+AUTOTOOL_STYLE:= autoreconf
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
TARGET_LDFLAGS+= -lpthread
ifneq ($(ADK_PACKAGE_LIBXML2_PYTHON),)
-CONFIGURE_ARGS+= --with-python=${STAGING_DIR}/usr
+CONFIGURE_ARGS+= --with-python=$(STAGING_TARGET_DIR)/usr
else
CONFIGURE_ARGS+= --without-python
endif
@@ -65,16 +66,13 @@ CONFIGURE_ARGS+= --without-c14n \
--with-xptr \
--with-zlib
-pre-configure:
- ${INSTALL_DIR} ${STAGING_DIR}/usr/lib/site-packages
-
libxml2-install:
${INSTALL_DIR} ${IDIR_LIBXML2}/usr/lib
${CP} ${WRKINST}/usr/lib/libxml2.so* ${IDIR_LIBXML2}/usr/lib
libxml2-python-install:
$(INSTALL_DIR) $(IDIR_LIBXML2_PYTHON)/usr/lib/python$(PYTHON_VERSION)/site-packages
- $(CP) $(WRKINST)/usr/lib/python$(PYTHON_VERSION)/site-packages/* \
+ $(CP) $(WRKINST)/usr/lib/python$(PYTHON_VERSION)/site-packages/*.{so,py} \
$(IDIR_LIBXML2_PYTHON)/usr/lib/python$(PYTHON_VERSION)/site-packages
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libxml2/patches/patch-configure b/package/libxml2/patches/patch-configure
deleted file mode 100644
index 2f9b3b5bf..000000000
--- a/package/libxml2/patches/patch-configure
+++ /dev/null
@@ -1,42 +0,0 @@
---- libxml2-2.9.1.orig/configure 2013-04-19 09:36:11.000000000 +0200
-+++ libxml2-2.9.1/configure 2013-09-25 13:59:27.000000000 +0200
-@@ -14010,17 +14010,17 @@ case ${host} in
- esac
-
-
--
-+set -x
- PYTHON_VERSION=
- PYTHON_INCLUDES=
- PYTHON_SITE_PACKAGES=
- PYTHON_TESTS=
- pythondir=
- if test "$with_python" != "no" ; then
-- if test -x "$with_python/bin/python"
-+ if test -x "$with_python/bin/hostpython"
- then
-- echo Found python in $with_python/bin/python
-- PYTHON="$with_python/bin/python"
-+ echo Found python in $with_python/bin/hostpython
-+ PYTHON="$with_python/bin/hostpython"
- else
- if test -x "$with_python/python.exe"
- then
-@@ -14122,7 +14122,7 @@ fi
- else
- if test -d $with_python/lib/site-packages
- then
-- PYTHON_SITE_PACKAGES=$with_python/lib/site-packages
-+ PYTHON_SITE_PACKAGES=/usr/lib/python$PYTHON_VERSION/site-packages
- else
- PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_lib())"`
- fi
-@@ -14148,7 +14148,7 @@ else
- PYTHON_SUBDIR=
- fi
-
--
-+set +x
-
-
- WITH_MODULES=0
diff --git a/package/libxml2/patches/patch-configure_in b/package/libxml2/patches/patch-configure_in
new file mode 100644
index 000000000..a8340e906
--- /dev/null
+++ b/package/libxml2/patches/patch-configure_in
@@ -0,0 +1,87 @@
+--- libxml2-2.9.1.orig/configure.in 2013-04-19 09:25:20.000000000 +0200
++++ libxml2-2.9.1/configure.in 2013-10-31 08:37:36.000000000 +0100
+@@ -748,80 +748,16 @@ PYTHON_SITE_PACKAGES=
+ PYTHON_TESTS=
+ pythondir=
+ if test "$with_python" != "no" ; then
+- if test -x "$with_python/bin/python"
+- then
+- echo Found python in $with_python/bin/python
+- PYTHON="$with_python/bin/python"
+- else
+- if test -x "$with_python/python.exe"
+- then
+- echo Found python in $with_python/python.exe
+- PYTHON="$with_python/python.exe"
+- else
+- if test -x "$with_python"
+- then
+- echo Found python in $with_python
+- PYTHON="$with_python"
+- else
+- if test -x "$PYTHON"
+- then
+- echo Found python in environment PYTHON=$PYTHON
+- with_python=`$PYTHON -c "import sys; print(sys.exec_prefix)"`
+- else
+- AC_PATH_PROG(PYTHON, python python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5)
+- fi
+- fi
+- fi
+- fi
++ AC_PATH_PROG(PYTHON, python python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5)
+ if test "$PYTHON" != ""
+ then
+ PYTHON_VERSION=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_version())"`
+- PYTHON_INCLUDES=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_inc())"`
+-# does not work as it produce a /usr/lib/python path instead of/usr/lib64/python
+-#
+-# PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_lib())"`
+ echo Found Python version $PYTHON_VERSION
+ fi
+- if test "$PYTHON_VERSION" != "" -a "$PYTHON_INCLUDES" = ""
+- then
+- if test -r $with_python/include/python$PYTHON_VERSION/Python.h
+- then
+- PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION
+- else
+- if test -r $prefix/include/python$PYTHON_VERSION/Python.h
+- then
+- PYTHON_INCLUDES=$prefix/include/python$PYTHON_VERSION
+- else
+- if test -r /usr/include/python$PYTHON_VERSION/Python.h
+- then
+- PYTHON_INCLUDES=/usr/include/python$PYTHON_VERSION
+- else
+- if test -r $with_python/include/Python.h
+- then
+- PYTHON_INCLUDES=$with_python/include
+- else
+- echo could not find python$PYTHON_VERSION/Python.h or $with_python/include/Python.h
+- fi
+- fi
+- fi
+- fi
+- fi
+- if test "$PYTHON_VERSION" != "" -a "$PYTHON_SITE_PACKAGES" = ""
+- then
+- if test -d $libdir/python$PYTHON_VERSION/site-packages
+- then
+- PYTHON_SITE_PACKAGES=$libdir/python$PYTHON_VERSION/site-packages
+- else
+- if test -d $with_python/lib/site-packages
+- then
+- PYTHON_SITE_PACKAGES=$with_python/lib/site-packages
+- else
+- PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_lib())"`
+- fi
+- fi
+- fi
++ PYTHON_INCLUDES=`$PYTHON$PYTHON_VERSION-config --includes`
++ PYTHON_LIBS=`$PYTHON$PYTHON_VERSION-config --ldflags`
++ PYTHON_SITE_PACKAGES=/usr/lib/python$PYTHON_VERSION/site-packages
+ pythondir='$(PYTHON_SITE_PACKAGES)'
+- PYTHON_LIBS=`python$PYTHON_VERSION-config --ldflags`
+ else
+ PYTHON=
+ fi
diff --git a/package/python2/Makefile b/package/python2/Makefile
index c0678a528..82c89c433 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:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= b4f01a1d0ba0b46b05c73b2ac909b1df
PKG_DESCR:= Python scripting language (Version 2)
PKG_SECTION:= lang
@@ -95,21 +95,11 @@ CONFIGURE_ARGS:= --with-threads \
--with-system-ffi \
--without-cxx-main
+HOST_STYLE:= auto
HOST_CONFIGURE_ARGS:= --without-threads \
--disable-toolbox-glue \
--without-cxx-main
-python2-hostinstall:
- $(INSTALL_BIN) ${HOST_WRKINST}/usr/bin/python \
- $(STAGING_HOST_DIR)/usr/bin
- $(INSTALL_BIN) ${WRKBUILD}/Parser/pgen \
- $(STAGING_HOST_DIR)/usr/bin/pgen
- $(CP) $(HOST_WRKINST)/usr/lib/python2.7 \
- $(STAGING_HOST_DIR)/usr/lib
- $(INSTALL_DIR) $(STAGING_HOST_DIR)/usr/include/python2.7
- ${CP} ${HOST_WRKINST}/usr/include/python2.7/pyconfig.h \
- $(STAGING_HOST_DIR)/usr/include/python2.7
-
python2-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m}
${INSTALL_DIR} ${IDIR_PYTHON2}/usr/bin ${IDIR_PYTHON2}/usr/lib
${INSTALL_DIR} ${IDIR_PYTHON2}/usr/lib/python2.7
diff --git a/package/python2/patches/patch-Misc_python-config_in b/package/python2/patches/patch-Misc_python-config_in
new file mode 100644
index 000000000..7ea806bea
--- /dev/null
+++ b/package/python2/patches/patch-Misc_python-config_in
@@ -0,0 +1,13 @@
+--- 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:
+ print sysconfig.EXEC_PREFIX
+
+ elif opt in ('--includes', '--cflags'):
+- flags = ['-I' + sysconfig.get_python_inc(),
+- '-I' + 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)
diff --git a/package/python2/patches/patch-configure_ac b/package/python2/patches/patch-configure_ac
new file mode 100644
index 000000000..0ec10f1de
--- /dev/null
+++ b/package/python2/patches/patch-configure_ac
@@ -0,0 +1,22 @@
+--- Python-2.7.5.orig/configure.ac 2013-05-12 05:32:54.000000000 +0200
++++ Python-2.7.5/configure.ac 2013-10-30 15:33:30.000000000 +0100
+@@ -19,7 +19,7 @@ AC_SUBST(host)
+ if test "$cross_compiling" = yes; then
+ AC_MSG_CHECKING([for python interpreter for cross build])
+ if test -z "$PYTHON_FOR_BUILD"; then
+- for interp in python$PACKAGE_VERSION python2 python; do
++ for interp in python; do
+ which $interp >/dev/null 2>&1 || continue
+ if $interp -c 'import sys;sys.exit(not (sys.version_info@<:@:2@:>@ >= (2,7) and sys.version_info@<:@0@:>@ < 3))'; then
+ break
+@@ -1066,9 +1066,7 @@ then
+ if test "$Py_DEBUG" = 'true' ; then
+ # Optimization messes up debuggers, so turn it off for
+ # debug builds.
+- OPT="-g -O0 -Wall $STRICT_PROTO"
+- else
+- OPT="-g $WRAP -O3 -Wall $STRICT_PROTO"
++ OPT="$STRICT_PROTO"
+ fi
+ ;;
+ *)
diff --git a/package/xcb-proto/Makefile b/package/xcb-proto/Makefile
index fd4674b47..64d441387 100644
--- a/package/xcb-proto/Makefile
+++ b/package/xcb-proto/Makefile
@@ -8,13 +8,13 @@ PKG_VERSION:= 1.8
PKG_RELEASE:= 1
PKG_DESCR:= XML-XCB protocol descriptions
PKG_SECTION:= devel
-PKG_BUILDDEP:= python2
PKG_MD5SUM:= 8d2cdb770129cef563088a90c5bec768
PKG_SITES:= http://xcb.freedesktop.org/dist/
PKG_OPTS:= dev devonly
PKG_SUBPKGS:= XCB_PROTO XCB_PYTHON
PKGSC_XCB_PYTHON:= x11/misc
+PKGSB_XCB_PYTHON:= python2-host
include $(TOPDIR)/mk/package.mk
diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh
index 74e13ddf0..985009051 100644
--- a/scripts/scan-pkgs.sh
+++ b/scripts/scan-pkgs.sh
@@ -23,13 +23,6 @@ out=0
. $topdir/.config
-uname -a|grep '\(Debian\|Ubuntu\)' >/dev/null 2>&1
-if [ $? -eq 0 ];then
- if [[ -n $ADK_COMPILE_PYTHON2 ]]; then
- NEED_DPKG_ARCHITECTURE="$NEED_DPKG_ARCHITECTURE python2"
- fi
-fi
-
if [[ -n $ADK_NATIVE ]];then
if [[ -n $ADK_PACKAGE_NEON ]];then
NEED_LIBXML2_DEV="$NEED_LIBXML2_DEV neon"
@@ -91,7 +84,6 @@ fi
if [[ -n $ADK_PACKAGE_FIREFOX ]]; then
NEED_YASM="$NEED_YASM firefox"
NEED_LIBIDL="$NEED_LIBIDL firefox"
- NEED_PYTHON="$NEED_PYTHON firefox"
NEED_ZIP="$NEED_ZIP firefox"
fi
@@ -448,15 +440,6 @@ if [[ -n $NEED_DBUSGLIB ]]; then
fi
fi
-if [[ -n $NEED_PYTHON ]]; then
- if ! which python >/dev/null 2>&1; then
- if ! test -x /usr/pkg/bin/python2.6 >/dev/null; then
- echo >&2 You need python to build $NEED_PYTHON
- out=1
- fi
- fi
-fi
-
if [[ -n $NEED_MAKEDEPEND ]]; then
if ! which makedepend >/dev/null 2>&1; then
echo >&2 You need makedepend to build $NEED_MAKEDEPEND
@@ -464,13 +447,6 @@ if [[ -n $NEED_MAKEDEPEND ]]; then
fi
fi
-if [[ -n $NEED_DPKG_ARCHITECTURE ]]; then
- if ! which dpkg-architecture >/dev/null 2>&1; then
- echo >&2 You need dpkg-architecture to build $NEED_DPKG_ARCHITECTURE
- out=1
- fi
-fi
-
if [[ -n $ADK_USE_CCACHE ]]; then
if ! which ccache >/dev/null 2>&1; then
echo >&2 You have selected to build with ccache, but ccache could not be found.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-19 23:46:49 +0000