From 1e94a6a04309a5d555f099c8cfa6648f41c64536 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 24 Sep 2013 16:14:23 +0200 Subject: [PATCH] llvm: update to llvm-3.3 Signed-off-by: Stephan Raue --- packages/devel/llvm/package.mk | 47 ++++---- .../devel/llvm/patches/llvm-3.0-cross.patch | 109 ----------------- .../devel/llvm/patches/llvm-3.3-cross.patch | 114 ++++++++++++++++++ packages/devel/llvm/rename | 25 ---- packages/graphics/Mesa/package.mk | 2 +- 5 files changed, 139 insertions(+), 158 deletions(-) delete mode 100644 packages/devel/llvm/patches/llvm-3.0-cross.patch create mode 100644 packages/devel/llvm/patches/llvm-3.3-cross.patch delete mode 100755 packages/devel/llvm/rename diff --git a/packages/devel/llvm/package.mk b/packages/devel/llvm/package.mk index 1c689bd520..b37e99a189 100644 --- a/packages/devel/llvm/package.mk +++ b/packages/devel/llvm/package.mk @@ -19,12 +19,12 @@ ################################################################################ PKG_NAME="llvm" -PKG_VERSION="3.0" +PKG_VERSION="3.3.src" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://llvm.org/" -PKG_URL="http://llvm.org/releases/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="http://llvm.org/releases/3.3/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_DEPENDS="" PKG_BUILD_DEPENDS_TARGET="toolchain llvm:host" PKG_BUILD_DEPENDS_HOST="toolchain" @@ -37,24 +37,11 @@ PKG_IS_ADDON="no" PKG_AUTORECONF="no" # package specific configure options -PKG_CONFIGURE_OPTS_HOST="--enable-polly \ - --enable-optimized \ - --disable-profiling \ +PKG_CONFIGURE_OPTS_HOST="--disable-polly \ --disable-assertions \ - --disable-expensive-checks \ + --enable-optimized \ --disable-debug-runtime \ - --disable-debug-symbols \ - --enable-jit \ - --disable-docs \ - --disable-doxygen \ - --enable-threads \ - --enable-pthreads \ - --enable-pic \ - --enable-shared \ - --enable-embed-stdcxx \ - --enable-timestamps \ - --disable-libffi \ - --enable-ltdl-install" + --disable-debug-symbols" PKG_CONFIGURE_OPTS_TARGET="--enable-polly \ --enable-optimized \ @@ -76,28 +63,42 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-polly \ --disable-ltdl-install" if [ "$TARGET_ARCH" = i386 ]; then - PKG_CONFIGURE_OPTS_HOST="$PKG_CONFIGURE_OPTS_HOST --enable-targets=x86" PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-targets=x86" elif [ "$TARGET_ARCH" = x86_64 ]; then - PKG_CONFIGURE_OPTS_HOST="$PKG_CONFIGURE_OPTS_HOST --enable-targets=x86_64" PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-targets=x86_64" +elif [ "$TARGET_ARCH" = arm ]; then + PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-targets=arm" fi -PKG_MAKE_OPTS_TARGET="LLVM_TBLGEN=$ROOT/$TOOLCHAIN/bin/llvm-tblgen" -PKG_MAKEINSTALL_OPTS_TARGET="LLVM_TBLGEN=$ROOT/$TOOLCHAIN/bin/llvm-tblgen" +PKG_MAKE_OPTS_HOST="BUILD_DIRS_ONLY=1 CFLAGS= CXXFLAGS=" pre_configure_host() { ( cd ../autoconf aclocal --force --verbose -I m4 autoconf --force --verbose -I m4 -o ../configure ) + + ( cd ../projects/sample/autoconf + aclocal --force --verbose -I m4 + autoconf --force --verbose -I m4 -o ../configure + ) + + # we are building hosttools inside the target builddir + mkdir -p ../.$TARGET_NAME && cd ../.$TARGET_NAME/ + rm -rf ../.$HOST_NAME + mkdir -p BuildTools && cd BuildTools } pre_configure_target() { - # llvm fails to build with LTO support +# llvm fails to build with LTO support strip_lto } +makeinstall_host() { +# nothing to install here + : +} + post_makeinstall_target() { rm -rf $INSTALL/usr/bin rm -rf $INSTALL/usr/lib/BugpointPasses.so diff --git a/packages/devel/llvm/patches/llvm-3.0-cross.patch b/packages/devel/llvm/patches/llvm-3.0-cross.patch deleted file mode 100644 index 197553bac4..0000000000 --- a/packages/devel/llvm/patches/llvm-3.0-cross.patch +++ /dev/null @@ -1,109 +0,0 @@ -diff -Naur llvm-3.0.src/autoconf/configure.ac llvm-3.0.src.patch/autoconf/configure.ac ---- llvm-3.0.src/autoconf/configure.ac 2011-10-16 04:52:56.000000000 +0200 -+++ llvm-3.0.src.patch/autoconf/configure.ac 2011-12-03 12:57:33.324415172 +0100 -@@ -393,6 +393,10 @@ - AC_CHECK_PROG(BUILD_CXX, c++, c++, , , /usr/ucb/c++) - fi - fi -+ AC_SUBST(BUILD_CPPFLAGS) -+ AC_SUBST(BUILD_CFLAGS) -+ AC_SUBST(BUILD_CXXFLAGS) -+ AC_SUBST(BUILD_LDFLAGS) - else - AC_SUBST(LLVM_CROSS_COMPILING, [0]) - fi -diff -Naur llvm-3.0.src/autoconf/m4/build_exeext.m4 llvm-3.0.src.patch/autoconf/m4/build_exeext.m4 ---- llvm-3.0.src/autoconf/m4/build_exeext.m4 2008-09-26 19:27:58.000000000 +0200 -+++ llvm-3.0.src.patch/autoconf/m4/build_exeext.m4 2011-12-03 12:57:33.327415229 +0100 -@@ -18,7 +18,7 @@ - fi - fi - test -z "$BUILD_CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH]) -- ac_build_link='${BUILD_CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AS_MESSAGE_LOG_FD' -+ ac_build_link='${BUILD_CC-cc} -o conftest $BUILD_CFLAGS $BUILD_CPPFLAGS $BUILD_LDFLAGS conftest.$ac_ext $LIBS 1>&AS_MESSAGE_LOG_FD' - rm -f conftest* - echo 'int main () { return 0; }' > conftest.$ac_ext - ac_cv_build_exeext= -diff -Naur llvm-3.0.src/Makefile llvm-3.0.src.patch/Makefile ---- llvm-3.0.src/Makefile 2011-10-08 02:27:38.000000000 +0200 -+++ llvm-3.0.src.patch/Makefile 2011-12-03 13:00:42.692055438 +0100 -@@ -104,38 +104,6 @@ - DIRS := $(filter-out unittests, $(DIRS)) - endif - --# If we're cross-compiling, build the build-hosted tools first --ifeq ($(LLVM_CROSS_COMPILING),1) --all:: cross-compile-build-tools -- --clean:: -- $(Verb) rm -rf BuildTools -- --cross-compile-build-tools: -- $(Verb) if [ ! -f BuildTools/Makefile ]; then \ -- $(MKDIR) BuildTools; \ -- cd BuildTools ; \ -- unset CFLAGS ; \ -- unset CXXFLAGS ; \ -- $(PROJ_SRC_DIR)/configure --build=$(BUILD_TRIPLE) \ -- --host=$(BUILD_TRIPLE) --target=$(BUILD_TRIPLE) \ -- --disable-polly ; \ -- cd .. ; \ -- fi; \ -- (unset SDKROOT; \ -- $(MAKE) -C BuildTools \ -- BUILD_DIRS_ONLY=1 \ -- UNIVERSAL= \ -- ENABLE_OPTIMIZED=$(ENABLE_OPTIMIZED) \ -- ENABLE_PROFILING=$(ENABLE_PROFILING) \ -- ENABLE_COVERAGE=$(ENABLE_COVERAGE) \ -- DISABLE_ASSERTIONS=$(DISABLE_ASSERTIONS) \ -- ENABLE_EXPENSIVE_CHECKS=$(ENABLE_EXPENSIVE_CHECKS) \ -- CFLAGS= \ -- CXXFLAGS= \ -- ) || exit 1; --endif -- - # Include the main makefile machinery. - include $(LLVM_SRC_ROOT)/Makefile.rules - -diff -Naur llvm-3.0.src/Makefile.config.in llvm-3.0.src.patch/Makefile.config.in ---- llvm-3.0.src/Makefile.config.in 2011-10-13 19:27:34.000000000 +0200 -+++ llvm-3.0.src.patch/Makefile.config.in 2011-12-03 12:57:33.962427436 +0100 -@@ -113,6 +113,10 @@ - # call if we're cross-compiling). - BUILD_CC=@BUILD_CC@ - BUILD_CXX=@BUILD_CXX@ -+BUILD_CPPFLAGS=@BUILD_CPPFLAGS@ -+BUILD_CFLAGS=@BUILD_CFLAGS@ -+BUILD_CXXFLAGS=@BUILD_CXXFLAGS@ -+BUILD_LDFLAGS=@BUILD_LDFLAGS@ - - # Triple for configuring build tools when cross-compiling - BUILD_TRIPLE=@build@ -diff -Naur llvm-3.0.src/Makefile.rules llvm-3.0.src.patch/Makefile.rules ---- llvm-3.0.src/Makefile.rules 2011-10-11 14:51:44.000000000 +0200 -+++ llvm-3.0.src.patch/Makefile.rules 2011-12-03 12:59:37.459801461 +0100 -@@ -641,18 +641,18 @@ - - ifeq ($(BUILD_COMPONENT), 1) - Compile.C = $(Compile.Wrapper) \ -- $(BUILD_CC) $(CPP.Flags) $(C.Flags) $(CFLAGS) $(CPPFLAGS) \ -+ $(BUILD_CC) $(CPP.Flags) $(C.Flags) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) \ - $(TargetCommonOpts) $(CompileCommonOpts) -c - Compile.CXX = $(Compile.Wrapper) \ -- $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(CXXFLAGS) \ -+ $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(BUILD_CXXFLAGS) \ - $(CPPFLAGS) \ - $(TargetCommonOpts) $(CompileCommonOpts) -c - Preprocess.CXX= $(Compile.Wrapper) \ -- $(BUILD_CXX) $(CPP.Flags) $(CPPFLAGS) $(TargetCommonOpts) \ -+ $(BUILD_CXX) $(CPP.Flags) $(BUILD_CPPFLAGS) $(TargetCommonOpts) \ - $(CompileCommonOpts) $(CXX.Flags) -E - Link = $(Compile.Wrapper) \ -- $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(CXXFLAGS) \ -- $(LD.Flags) $(LDFLAGS) \ -+ $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(BUILD_CXXFLAGS) \ -+ $(LD.Flags) $(BUILD_LDFLAGS) \ - $(TargetCommonOpts) $(CompileCommonOpts) $(Strip) - else - Compile.C = $(Compile.Wrapper) \ diff --git a/packages/devel/llvm/patches/llvm-3.3-cross.patch b/packages/devel/llvm/patches/llvm-3.3-cross.patch new file mode 100644 index 0000000000..77618753a3 --- /dev/null +++ b/packages/devel/llvm/patches/llvm-3.3-cross.patch @@ -0,0 +1,114 @@ +diff -Naur llvm-3.3.src/autoconf/configure.ac llvm-3.3.src.patch/autoconf/configure.ac +--- llvm-3.3.src/autoconf/configure.ac 2013-05-20 22:18:23.000000000 +0200 ++++ llvm-3.3.src.patch/autoconf/configure.ac 2013-09-24 07:20:25.485443916 +0200 +@@ -461,6 +461,10 @@ + AC_CHECK_PROG(BUILD_CXX, c++, c++, , , /usr/ucb/c++) + fi + fi ++ AC_SUBST(BUILD_CPPFLAGS) ++ AC_SUBST(BUILD_CFLAGS) ++ AC_SUBST(BUILD_CXXFLAGS) ++ AC_SUBST(BUILD_LDFLAGS) + else + AC_SUBST(LLVM_CROSS_COMPILING, [0]) + fi +diff -Naur llvm-3.3.src/autoconf/m4/build_exeext.m4 llvm-3.3.src.patch/autoconf/m4/build_exeext.m4 +--- llvm-3.3.src/autoconf/m4/build_exeext.m4 2008-09-26 19:27:58.000000000 +0200 ++++ llvm-3.3.src.patch/autoconf/m4/build_exeext.m4 2013-09-24 07:20:25.485443916 +0200 +@@ -18,7 +18,7 @@ + fi + fi + test -z "$BUILD_CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH]) +- ac_build_link='${BUILD_CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AS_MESSAGE_LOG_FD' ++ ac_build_link='${BUILD_CC-cc} -o conftest $BUILD_CFLAGS $BUILD_CPPFLAGS $BUILD_LDFLAGS conftest.$ac_ext $LIBS 1>&AS_MESSAGE_LOG_FD' + rm -f conftest* + echo 'int main () { return 0; }' > conftest.$ac_ext + ac_cv_build_exeext= +diff -Naur llvm-3.3.src/Makefile llvm-3.3.src.patch/Makefile +--- llvm-3.3.src/Makefile 2013-01-28 04:19:57.000000000 +0100 ++++ llvm-3.3.src.patch/Makefile 2013-09-24 07:21:27.489493235 +0200 +@@ -99,44 +99,6 @@ + DIRS := $(filter-out unittests, $(DIRS)) + endif + +-# If we're cross-compiling, build the build-hosted tools first +-ifeq ($(LLVM_CROSS_COMPILING),1) +-all:: cross-compile-build-tools +- +-clean:: +- $(Verb) rm -rf BuildTools +- +-cross-compile-build-tools: +- $(Verb) if [ ! -f BuildTools/Makefile ]; then \ +- $(MKDIR) BuildTools; \ +- cd BuildTools ; \ +- unset CFLAGS ; \ +- unset CXXFLAGS ; \ +- unset SDKROOT ; \ +- unset UNIVERSAL_SDK_PATH ; \ +- $(PROJ_SRC_DIR)/configure --build=$(BUILD_TRIPLE) \ +- --host=$(BUILD_TRIPLE) --target=$(BUILD_TRIPLE) \ +- --disable-polly ; \ +- cd .. ; \ +- fi; \ +- ($(MAKE) -C BuildTools \ +- BUILD_DIRS_ONLY=1 \ +- UNIVERSAL= \ +- UNIVERSAL_SDK_PATH= \ +- SDKROOT= \ +- TARGET_NATIVE_ARCH="$(TARGET_NATIVE_ARCH)" \ +- TARGETS_TO_BUILD="$(TARGETS_TO_BUILD)" \ +- ENABLE_OPTIMIZED=$(ENABLE_OPTIMIZED) \ +- ENABLE_PROFILING=$(ENABLE_PROFILING) \ +- ENABLE_COVERAGE=$(ENABLE_COVERAGE) \ +- DISABLE_ASSERTIONS=$(DISABLE_ASSERTIONS) \ +- ENABLE_EXPENSIVE_CHECKS=$(ENABLE_EXPENSIVE_CHECKS) \ +- ENABLE_LIBCPP=$(ENABLE_LIBCPP) \ +- CFLAGS= \ +- CXXFLAGS= \ +- ) || exit 1; +-endif +- + # Include the main makefile machinery. + include $(LLVM_SRC_ROOT)/Makefile.rules + +diff -Naur llvm-3.3.src/Makefile.config.in llvm-3.3.src.patch/Makefile.config.in +--- llvm-3.3.src/Makefile.config.in 2013-04-23 10:28:39.000000000 +0200 ++++ llvm-3.3.src.patch/Makefile.config.in 2013-09-24 07:20:25.487443917 +0200 +@@ -130,6 +130,10 @@ + # call if we're cross-compiling). + BUILD_CC=@BUILD_CC@ + BUILD_CXX=@BUILD_CXX@ ++BUILD_CPPFLAGS=@BUILD_CPPFLAGS@ ++BUILD_CFLAGS=@BUILD_CFLAGS@ ++BUILD_CXXFLAGS=@BUILD_CXXFLAGS@ ++BUILD_LDFLAGS=@BUILD_LDFLAGS@ + + # Triple for configuring build tools when cross-compiling + BUILD_TRIPLE=@build@ +diff -Naur llvm-3.3.src/projects/sample/autoconf/configure.ac llvm-3.3.src.patch/projects/sample/autoconf/configure.ac +--- llvm-3.3.src/projects/sample/autoconf/configure.ac 2013-05-06 18:23:07.000000000 +0200 ++++ llvm-3.3.src.patch/projects/sample/autoconf/configure.ac 2013-09-24 07:33:47.746272015 +0200 +@@ -345,6 +345,10 @@ + AC_CHECK_PROG(BUILD_CXX, c++, c++, , , /usr/ucb/c++) + fi + fi ++ AC_SUBST(BUILD_CPPFLAGS) ++ AC_SUBST(BUILD_CFLAGS) ++ AC_SUBST(BUILD_CXXFLAGS) ++ AC_SUBST(BUILD_LDFLAGS) + else + AC_SUBST(LLVM_CROSS_COMPILING, [0]) + fi +diff -Naur llvm-3.3.src/projects/sample/autoconf/m4/build_exeext.m4 llvm-3.3.src.patch/projects/sample/autoconf/m4/build_exeext.m4 +--- llvm-3.3.src/projects/sample/autoconf/m4/build_exeext.m4 2011-10-19 01:10:47.000000000 +0200 ++++ llvm-3.3.src.patch/projects/sample/autoconf/m4/build_exeext.m4 2013-09-24 07:32:18.332178706 +0200 +@@ -18,7 +18,7 @@ + fi + fi + test -z "$BUILD_CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH]) +- ac_build_link='${BUILD_CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AS_MESSAGE_LOG_FD' ++ ac_build_link='${BUILD_CC-cc} -o conftest $BUILD_CFLAGS $BUILD_CPPFLAGS $BUILD_LDFLAGS conftest.$ac_ext $LIBS 1>&AS_MESSAGE_LOG_FD' + rm -f conftest* + echo 'int main () { return 0; }' > conftest.$ac_ext + ac_cv_build_exeext= diff --git a/packages/devel/llvm/rename b/packages/devel/llvm/rename deleted file mode 100755 index adbf133fa9..0000000000 --- a/packages/devel/llvm/rename +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -mv $BUILD/$PKG_NAME-$PKG_VERSION.src $BUILD/$PKG_NAME-$PKG_VERSION diff --git a/packages/graphics/Mesa/package.mk b/packages/graphics/Mesa/package.mk index 14426a83ea..a7ce0092a3 100644 --- a/packages/graphics/Mesa/package.mk +++ b/packages/graphics/Mesa/package.mk @@ -50,7 +50,7 @@ PKG_AUTORECONF="yes" if [ "$LLVM_SUPPORT" = "yes" ]; then PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET llvm" PKG_DEPENDS="$PKG_DEPENDS llvm" - export LLVM_CONFIG="$SYSROOT_PREFIX/usr/bin/llvm-config" + export LLVM_CONFIG="$SYSROOT_PREFIX/usr/bin/llvm-config-host" MESA_GALLIUM_LLVM="--enable-gallium-llvm --with-llvm-shared-libs" else MESA_GALLIUM_LLVM="--disable-gallium-llvm"