diff options
| -rw-r--r-- | package/libX11/patches/patch-src_util_Makefile_in | 17 | ||||
| -rw-r--r-- | package/python2/Makefile | 3 | ||||
| -rw-r--r-- | scripts/scan-pkgs.sh | 13 | ||||
| -rwxr-xr-x | scripts/tar | 9 | ||||
| -rw-r--r-- | toolchain/gmp/Makefile | 6 |
5 files changed, 38 insertions, 10 deletions
diff --git a/package/libX11/patches/patch-src_util_Makefile_in b/package/libX11/patches/patch-src_util_Makefile_in index 2c1689069..6af15c2b5 100644 --- a/package/libX11/patches/patch-src_util_Makefile_in +++ b/package/libX11/patches/patch-src_util_Makefile_in @@ -1,13 +1,24 @@ --- libX11-1.4.0.orig/src/util/Makefile.in 2010-11-21 23:15:55.000000000 +0100 -+++ libX11-1.4.0/src/util/Makefile.in 2011-04-28 22:56:41.000000000 +0200 -@@ -262,7 +262,6 @@ top_build_prefix = @top_build_prefix@ ++++ libX11-1.4.0/src/util/Makefile.in 2011-10-21 09:41:05.000000000 +0200 +@@ -143,7 +143,7 @@ LD = @LD@ + LDFLAGS = @LDFLAGS_FOR_BUILD@ + LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ + LIBOBJS = @LIBOBJS@ +-LIBS = @LIBS@ ++LIBS = + LIBTOOL = @LIBTOOL@ + LIB_MAN_DIR = @LIB_MAN_DIR@ + LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ +@@ -262,8 +262,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ makekeys_CFLAGS = \ - $(X11_CFLAGS) \ - $(CWARNFLAGS) +- $(CWARNFLAGS) ++ $(CWARNFLAGS) -I/usr/local/include EXTRA_DIST = mkks.sh + @@ -351,12 +350,12 @@ distclean-compile: @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< diff --git a/package/python2/Makefile b/package/python2/Makefile index b28b5d49e..5464d3d7a 100644 --- a/package/python2/Makefile +++ b/package/python2/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= python2 PKG_VERSION:= 2.7.1 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 15ed56733655e3fab785e49a7278d2fb PKG_DESCR:= Python scripting language (Version 2) PKG_SECTION:= lang @@ -31,6 +31,7 @@ $(eval $(call PKG_template,PYTHON2_BZIP2,${PKG_NAME}-bzip2,${PKG_VERSION}-${PKG_ $(eval $(call PKG_template,PYTHON2_READLINE,${PKG_NAME}-readline,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_PYTHON2_READLINE},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) TARGET_CFLAGS+= -fPIC +TARGET_LDFLAGS+= -L. MAKE_ENV+= OPT="$(TARGET_CFLAGS)" \ RANLIB="${TARGET_CROSS}ranlib" \ HOSTPYTHON=./hostpython \ diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index 0bf8f5808..67703df58 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -61,6 +61,10 @@ if [[ -n $ADK_NATIVE ]];then fi fi +if [[ -n $ADK_PACKAGE_LIBX11 ]]; then + NEED_X11="$NEED_X11 libx11" +fi + if [[ -n $ADK_PACKAGE_GPSD ]]; then NEED_PYTHON="$NEED_PYTHON gpsd" fi @@ -236,6 +240,15 @@ if [[ -n $NEED_X11DEV ]];then fi fi +if [[ -n $NEED_X11 ]];then + if ! test -f /usr/include/X11/X.h >/dev/null; then + if ! test -f /usr/local/include/X11/X.h >/dev/null; then + echo >&2 You need X11 headers to build $NEED_X11 + out=1 + fi + fi +fi + if [[ -n $NEED_XEXTDEV ]];then if ! test -f /usr/include/X11/extensions/XShm.h >/dev/null; then echo >&2 You need X11 extensions headers to build $NEED_XEXTDEV diff --git a/scripts/tar b/scripts/tar new file mode 100755 index 000000000..60c5057da --- /dev/null +++ b/scripts/tar @@ -0,0 +1,9 @@ +#!/usr/bin/env bash +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +if [ -z "$(which gtar 2>/dev/null)" ];then + /bin/tar "$@" +else + gtar "$@" +fi diff --git a/toolchain/gmp/Makefile b/toolchain/gmp/Makefile index c96ad76b2..202709540 100644 --- a/toolchain/gmp/Makefile +++ b/toolchain/gmp/Makefile @@ -12,13 +12,7 @@ endif $(WRKBUILD)/.headers: $(WRKBUILD)/.configured: -# for cygwin and ubunto on amd64 -ifneq (,$(filter CYGWIN%,${OStype})) (cd $(WRKBUILD); cp configfsf.guess config.guess) -endif -ifeq (${OStype},Linux) - (cd $(WRKBUILD); cp configfsf.guess config.guess) -endif (cd $(WRKBUILD); \ ./configure \ --prefix=$(STAGING_HOST_DIR) \ |