Browse Source

Merge branch 'master' of git+ssh://openadk.org/git/openadk

Waldemar Brodkorb 10 years ago
parent
commit
ddce26e9c1

+ 2 - 2
package/boost/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		boost
 PKG_VERSION:=		1.55.0
-PKG_RELEASE:=		4
+PKG_RELEASE:=		5
 PKG_MD5SUM:=		93780777cfbf999a600f62883bd54b17
 PKG_DESCR:=		boost C++ library
 PKG_SECTION:=		libs
@@ -105,7 +105,7 @@ BOOST_ARCH:=	$(ARCH)
 endif
 
 # some variables for build
-GPP_PATH:=	${STAGING_HOST_DIR}/bin/${GNU_TARGET_NAME}-g++
+GPP_PATH:=	${TOOLCHAIN_DIR}/usr/bin/${GNU_TARGET_NAME}-g++
 GPP_VERSION:=	"`${GPP_PATH} -v 2>&1 | tail -1 | awk '{print $$3}'`"
 BJAM_PATH:=	"`find ${WRKBUILD} -type f -name "bjam$(EXEEXT)"`"
 PYTHON_PATH:=	${STAGING_HOST_DIR}/usr/bin/python

File diff suppressed because it is too large
+ 337 - 90
toolchain/musl/patches/musl-git-20140318.patch


+ 0 - 12
toolchain/musl/patches/musl-x32.patch

@@ -1,12 +0,0 @@
-diff -Nur musl-0.9.15.orig/configure musl-0.9.15/configure
---- musl-0.9.15.orig/configure	2014-03-16 21:17:29.000000000 +0100
-+++ musl-0.9.15/configure	2014-03-16 22:46:46.000000000 +0100
-@@ -226,7 +226,7 @@
- mips64*|powerpc64*) fail "$0: unsupported target \"$target\"" ;;
- arm*) ARCH=arm ;;
- i?86*) ARCH=i386 ;;
--x86_64-x32*|x32*) ARCH=x32 ;;
-+x86_64*x32) ARCH=x32 ;;
- x86_64*) ARCH=x86_64 ;;
- mips*) ARCH=mips ;;
- microblaze*) ARCH=microblaze ;;

Some files were not shown because too many files changed in this diff