diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-08-12 16:27:26 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-08-12 16:27:26 +0200 |
| commit | a73768182ca41f0b1fd1703bdaf06a69036685a8 (patch) | |
| tree | 81a307e5ee735576836b808b4a1f888bc91173d6 /package | |
| parent | b0857d40f503a29f7cf1dd9bfab3f60e6b0152f6 (diff) | |
| parent | a8fcbeb4ae4503c85ccc0c7d646ae88f6fa0e66e (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package')
| -rw-r--r-- | package/llvm/Makefile | 13 | ||||
| -rw-r--r-- | package/llvm/patches/patch-Makefile | 9 |
2 files changed, 13 insertions, 9 deletions
diff --git a/package/llvm/Makefile b/package/llvm/Makefile index 691928c24..091124132 100644 --- a/package/llvm/Makefile +++ b/package/llvm/Makefile @@ -4,19 +4,20 @@ include $(TOPDIR)/rules.mk PKG_NAME:= llvm -PKG_VERSION:= 2.9 +PKG_VERSION:= 3.3 PKG_RELEASE:= 1 -PKG_MD5SUM:= 793138412d2af2c7c7f54615f8943771 +PKG_MD5SUM:= 40564e1dc390f9844f1711c08b08e391 PKG_DESCR:= collection of modular and reusable compiler and toolchain technologies PKG_SECTION:= lang PKG_URL:= http://llvm.org/ -PKG_SITES:= http://llvm.org/releases/2.9/ +PKG_SITES:= http://llvm.org/releases/3.3/ PKG_CFLINE_LLVM:= depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC PKG_HOST_DEPENDS:= !darwin -PKG_ARCH_DEPENDS:= mips x86 x86_64 +PKG_ARCH_DEPENDS:= mips x86 x86_64 arm -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.src.tar.gz +WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}.src include $(TOPDIR)/mk/package.mk @@ -29,6 +30,7 @@ $(eval $(call PKG_template,LLVM,llvm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual +XAKE_FLAGS+= VERBOSE=1 do-configure: mkdir -p $(WRKBUILD)/BuildTools @@ -39,6 +41,7 @@ do-build: do-install: env GCC_HONOUR_COPTS=s ${MAKE} -C ${WRKBUILD}/BuildTools DESTDIR=$(STAGING_TARGET_DIR) install + env GCC_HONOUR_COPTS=s ${MAKE} -C ${WRKBUILD}/BuildTools DESTDIR=$(WRKINST) install llvm-install: $(INSTALL_DIR) $(IDIR_LLVM)/usr/bin diff --git a/package/llvm/patches/patch-Makefile b/package/llvm/patches/patch-Makefile index b1a4c6bcc..74a8af7f3 100644 --- a/package/llvm/patches/patch-Makefile +++ b/package/llvm/patches/patch-Makefile @@ -1,11 +1,12 @@ ---- llvm-2.9.orig/Makefile 2010-11-29 19:16:10.000000000 +0100 -+++ llvm-2.9/Makefile 2011-06-25 12:16:13.422682536 +0200 -@@ -115,6 +115,8 @@ cross-compile-build-tools: +--- llvm-3.3.src.orig/Makefile 2013-01-28 04:19:57.000000000 +0100 ++++ llvm-3.3.src/Makefile 2013-08-12 14:50:49.000000000 +0200 +@@ -110,6 +110,9 @@ cross-compile-build-tools: $(Verb) if [ ! -f BuildTools/Makefile ]; then \ $(MKDIR) BuildTools; \ cd BuildTools ; \ + unset CC ; \ + unset CXX ; \ ++ unset RANLIB ; \ unset CFLAGS ; \ unset CXXFLAGS ; \ - $(PROJ_SRC_DIR)/configure --build=$(BUILD_TRIPLE) \ + unset SDKROOT ; \ |