From 243d0f0ec9def264a7381ae8d648f406f194fcb7 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 20 Feb 2016 10:51:31 +0000 Subject: [PATCH] clang: remove, is now a subpackage of llvm. --- sys-devel/clang/clang-3.0.recipe | 28 -- sys-devel/clang/clang-3.2.recipe | 97 ------ sys-devel/clang/clang-3.4.recipe | 125 -------- sys-devel/clang/clang-3.5.1.recipe | 113 ------- sys-devel/clang/licenses/UIUC | 69 ----- sys-devel/clang/patches/clang-3.4.patchset | 117 ------- sys-devel/clang/patches/clang-3.5.1.patchset | 302 ------------------- sys-devel/clang/patches/llvm-3.4.patchset | 47 --- sys-devel/clang/patches/llvm-3.5.1.patchset | 47 --- 9 files changed, 945 deletions(-) delete mode 100644 sys-devel/clang/clang-3.0.recipe delete mode 100644 sys-devel/clang/clang-3.2.recipe delete mode 100644 sys-devel/clang/clang-3.4.recipe delete mode 100644 sys-devel/clang/clang-3.5.1.recipe delete mode 100644 sys-devel/clang/licenses/UIUC delete mode 100644 sys-devel/clang/patches/clang-3.4.patchset delete mode 100644 sys-devel/clang/patches/clang-3.5.1.patchset delete mode 100644 sys-devel/clang/patches/llvm-3.4.patchset delete mode 100644 sys-devel/clang/patches/llvm-3.5.1.patchset diff --git a/sys-devel/clang/clang-3.0.recipe b/sys-devel/clang/clang-3.0.recipe deleted file mode 100644 index c4b638240..000000000 --- a/sys-devel/clang/clang-3.0.recipe +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION="clang: an llvm front end compiler for C and C++" -HOMEPAGE="http://www.llvm.org/" -SOURCE_URI="http://llvm.org/releases/3.0/llvm-3.0.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="groff" -CHECKSUM_MD5="a8e5f5f1c1adebae7b4a654c376a6005" -MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -BUILD() -{ - cd llvm-3.0.src/tools - wget "http://llvm.org/releases/3.0/clang-3.0.tar.gz" - echo "Extracting clang llvm tool..." - tar xzf clang-3.0.tar.gz - mv clang-3.0.src clang - cd .. - ./configure --enable-optimized --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd llvm-3.0.src - make install -} - -LICENSE="UIUC" -COPYRIGHT="2003-2010 University of Illinois at Urbana-Champaign" diff --git a/sys-devel/clang/clang-3.2.recipe b/sys-devel/clang/clang-3.2.recipe deleted file mode 100644 index a86fea50e..000000000 --- a/sys-devel/clang/clang-3.2.recipe +++ /dev/null @@ -1,97 +0,0 @@ -SUMMARY="A llvm front end compiler for C and C++" -DESCRIPTION=" -Clang is an 'LLVM native' C/C++/Objective-C compiler, which aims to deliver \ -amazingly fast compiles (e.g. about 3x faster than GCC when compiling \ -Objective-C code in a debug configuration), extremely useful error and warning \ -messages and to provide a platform for building great source level tools. -" - -HOMEPAGE="http://www.llvm.org/" -LICENSE="UIUC" -COPYRIGHT="2003-2012 University of Illinois at Urbana-Champaign" - -SOURCE_URI="http://llvm.org/releases/${portVersion}/llvm-${portVersion}.src.tar.gz" -CHECKSUM_SHA256="125090c4d26740f1d5e9838477c931ed7d9ad70d599ba265f46f3a42cb066343" -SOURCE_URI_2="http://llvm.org/releases/${portVersion}/clang-${portVersion}.src.tar.gz" -CHECKSUM_SHA256_2="2aaaf03f7c0f6b16fe97ecc81247dc2bf2d4bec7620a77cc74670b7e07ff5658" -REVISION="1" - -ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64" -SECONDARY_ARCHITECTURES="x86" - -PROVIDES=" - clang$secondaryArchSuffix = $portVersion - cmd:clang = $portVersion - cmd:clang++ = $portVersion - cmd:c_index_test = $portVersion - lib:libLTO = $portVersion - lib:libclang = $portVersion - lib:libprofile_rt = $portVersion - " - -REQUIRES=" - haiku$secondaryArchSuffix - " - -BUILD_REQUIRES=" - " - -BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel - cmd:aclocal - cmd:autoconf - cmd:automake - cmd:gcc$secondaryArchSuffix - cmd:groff - cmd:ld$secondaryArchSuffix - cmd:libtoolize - cmd:make - cmd:python - cmd:sed - " - -SOURCE_DIR="llvm-${portVersion}.src" - -BUILD() -{ - mkdir -p tools/clang - cp -rd $sourceDir2/clang-${portVersion}.src/* tools/clang/ - #cp -r /boot/system/data/libtool/config/. autoconf/ - #cp -r /boot/system/data/libtool/config/. projects/sample/autoconf/ - - # Haiku C++ requires rtti in a lot of central system components - # such as Mesa - export REQUIRES_RTTI=1 - - # TODO: clang's build system seems to ignore doc / man / shared dirs? - runConfigure ./configure --enable-optimized - make $jobArgs -} - -INSTALL() -{ - mkdir -p $developDir - mkdir -p $docDir - - make install-clang - - # devel package - packageEntries devel \ - $developDir -} - -TEST() -{ - make check -} - - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - clang${secondaryArchSuffix}_devel = $portVersion - " - -REQUIRES_devel=" - clang$secondaryArchSuffix == $portVersion base - " diff --git a/sys-devel/clang/clang-3.4.recipe b/sys-devel/clang/clang-3.4.recipe deleted file mode 100644 index 211706cae..000000000 --- a/sys-devel/clang/clang-3.4.recipe +++ /dev/null @@ -1,125 +0,0 @@ -SUMMARY="A llvm front end compiler for C and C++" -DESCRIPTION=" -Clang is an 'LLVM native' C/C++/Objective-C compiler, which aims to deliver \ -amazingly fast compiles (e.g. about 3x faster than GCC when compiling \ -Objective-C code in a debug configuration), extremely useful error and warning \ -messages and to provide a platform for building great source level tools. -" - -HOMEPAGE="http://www.llvm.org/" -LICENSE="UIUC" -COPYRIGHT="2003-2012 University of Illinois at Urbana-Champaign" - -SOURCE_URI="http://llvm.org/releases/${portVersion}/llvm-${portVersion}.src.tar.gz" -CHECKSUM_SHA256="25a5612d692c48481b9b397e2b55f4870e447966d66c96d655241702d44a2628" - -SOURCE_URI_2="http://llvm.org/releases/${portVersion}/clang-${portVersion}.src.tar.gz" -CHECKSUM_SHA256_2="22a9780db3b85a7f2eb9ea1f7f6e00da0249e3d12851e8dea0f62f1783242b1b" - -REVISION="2" - -ARCHITECTURES="!x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86" - -PROVIDES=" - clang$secondaryArchSuffix = $portVersion - cmd:clang = $portVersion - cmd:clang++ = $portVersion - cmd:c_index_test = $portVersion - lib:libLTO$secondaryArchSuffix = $portVersion - lib:libclang$secondaryArchSuffix = $portVersion - devel:libLTO$secondaryArchSuffix = $portVersion - devel:libclang$secondaryArchSuffix = $portVersion - " - -REQUIRES=" - haiku$secondaryArchSuffix - " - -BUILD_REQUIRES=" - " - -BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel - cmd:aclocal - cmd:autoconf - cmd:automake - cmd:gcc$secondaryArchSuffix - cmd:groff - cmd:ld$secondaryArchSuffix - cmd:libtoolize - cmd:make - cmd:python - cmd:sed - " - -SOURCE_DIR="llvm-${portVersion}" - -PATCHES="llvm-${portVersion}.patchset" -PATCHES_2="clang-${portVersion}.patchset" - -BUILD() -{ - mkdir -p tools/clang - cp -rd $sourceDir2/clang-${portVersion}/* tools/clang/ - #cp -r /boot/system/data/libtool/config/. autoconf/ - #cp -r /boot/system/data/libtool/config/. projects/sample/autoconf/ - - # Haiku C++ requires rtti in a lot of central system components - # such as Mesa - export REQUIRES_RTTI=1 - - # TODO: clang's build system seems to ignore doc / man / shared dirs? - runConfigure ./configure --enable-optimized - make $jobArgs PROJ_datadir=$dataDir PROJ_docsdir=$docDir \ - PROJ_mandir=$manDir PROJ_includedir=$includeDir PROJ_libdir=$libDir -} - -INSTALL() -{ - mkdir -p $developDir - mkdir -p $docDir - mkdir -p $binDir - - make install-clang PROJ_datadir=$dataDir PROJ_docsdir=$docDir \ - PROJ_mandir=$manDir PROJ_includedir=$includeDir PROJ_libdir=$libDir - - # Remove empty dir that shouldn't be created - rmdir $prefix/include - - # Install static analysis tools - mkdir -p $developDir/tools/clang$secondaryArchSuffix - cp -Ra tools/clang/tools/scan-build $developDir/tools/clang$secondaryArchSuffix/ - cp -Ra tools/clang/tools/scan-view $developDir/tools/clang$secondaryArchSuffix/ - - ln -s $developDir/tools/clang$secondaryArchSuffix/scan-build/scan-build $binDir/scan-build - ln -s $developDir/tools/clang$secondaryArchSuffix/scan-view/scan-view $binDir/scan-view - ln -s $binDir/clang $developDir/tools/clang$secondaryArchSuffix/scan-build/clang - - prepareInstalledDevelLibs libclang libLTO - - # analysis package - packageEntries analysis \ - $binDir/scan-build \ - $binDir/scan-view \ - $developDir/tools/clang$secondaryArchSuffix -} - -TEST() -{ - make check -} - - -# ----- analysis package ------------------------------------------------------- - -SUMMARY_analysis="Static analysis tools using the clang compiler" -PROVIDES_analysis=" - clang${secondaryArchSuffix}_analysis = $portVersion - cmd:scan_build$secondaryArchSuffix = $portVersion - cmd:scan_view$secondaryArchSuffix = $portVersion - " - -REQUIRES_analysis=" - clang$secondaryArchSuffix == $portVersion base - " diff --git a/sys-devel/clang/clang-3.5.1.recipe b/sys-devel/clang/clang-3.5.1.recipe deleted file mode 100644 index 9a74aa0b0..000000000 --- a/sys-devel/clang/clang-3.5.1.recipe +++ /dev/null @@ -1,113 +0,0 @@ -SUMMARY="A llvm front end compiler for C, C++ and Objective-C" -SUMMARY_analysis="Static analysis tools using the clang compiler" -DESCRIPTION="Clang is an 'LLVM native' C/C++/Objective-C compiler, which aims \ -to deliver amazingly fast compiles (e.g. about 3x faster than GCC when \ -compiling Objective-C code in a debug configuration), extremely useful error \ -and warning messages and to provide a platform for building great source \ -level tools." -HOMEPAGE="http://www.llvm.org/" -COPYRIGHT="2003-2012 University of Illinois at Urbana-Champaign" -LICENSE="UIUC" -REVISION="2" -SOURCE_URI="http://llvm.org/releases/${portVersion}/llvm-${portVersion}.src.tar.xz" -SOURCE_URI_2="http://llvm.org/releases/${portVersion}/cfe-${portVersion}.src.tar.xz" -SOURCE_URI_3="http://llvm.org/releases/${portVersion}/clang-tools-extra-${portVersion}.src.tar.xz" -CHECKSUM_SHA256="bf3275d2d7890015c8d8f5e6f4f882f8cf3bf51967297ebe74111d6d8b53be15" -CHECKSUM_SHA256_2="6773f3f9cf815631cc7e779ec134ddd228dc8e9a250e1ea3a910610c59eb8f5c" -CHECKSUM_SHA256_3="e8d011250389cfc36eb51557ca25ae66ab08173e8d53536a0747356105d72906" -SOURCE_DIR="llvm-$portVersion.src" -PATCHES="llvm-${portVersion}.patchset" -PATCHES_2="clang-${portVersion}.patchset" - -ARCHITECTURES="!x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86" - -PROVIDES=" - clang$secondaryArchSuffix = $portVersion - cmd:clang = $portVersion - cmd:clang++ = $portVersion - cmd:c_index_test = $portVersion - lib:libclang$secondaryArchSuffix = $portVersion - devel:libclang$secondaryArchSuffix = $portVersion - " -REQUIRES=" - haiku$secondaryArchSuffix - " - -PROVIDES_analysis=" - clang${secondaryArchSuffix}_analysis = $portVersion - cmd:scan_build$secondaryArchSuffix = $portVersion - cmd:scan_view$secondaryArchSuffix = $portVersion - " -REQUIRES_analysis=" - clang$secondaryArchSuffix == $portVersion base - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - " -BUILD_PREREQUIRES=" - cmd:aclocal - cmd:autoconf - cmd:automake - cmd:find - cmd:gcc$secondaryArchSuffix - cmd:groff - cmd:ld$secondaryArchSuffix - cmd:libtoolize - cmd:make - cmd:python - cmd:sed - " - -BUILD() -{ - # Add clang tools - mkdir -p tools/clang - cp -rd $sourceDir2/cfe-${portVersion}.src/* tools/clang/ - - # Add clang tools's tool's (really llvm?) - mkdir -p tools/clang/tools/extra - cp -rd $sourceDir3/clang-tools-extra-${portVersion}.src/* tools/clang/tools/extra - - # Haiku C++ requires rtti in a lot of central system components - # such as Mesa - export REQUIRES_RTTI=1 - - # TODO: clang's build system seems to ignore doc / man / shared dirs? - runConfigure ./configure --enable-optimized - make $jobArgs PROJ_datadir=$dataDir PROJ_docsdir=$docDir \ - PROJ_mandir=$manDir PROJ_includedir=$includeDir PROJ_libdir=$libDir -} - -INSTALL() -{ - mkdir -p $developDir - mkdir -p $docDir - mkdir -p $binDir - - make -C tools/clang install PROJ_datadir=$dataDir PROJ_docsdir=$docDir \ - PROJ_mandir=$manDir PROJ_includedir=$includeDir PROJ_libdir=$libDir - - # Install static analysis tools - mkdir -p $developDir/tools/clang$secondaryArchSuffix - cp -Ra tools/clang/tools/scan-build $developDir/tools/clang$secondaryArchSuffix/ - cp -Ra tools/clang/tools/scan-view $developDir/tools/clang$secondaryArchSuffix/ - - ln -s $developDir/tools/clang$secondaryArchSuffix/scan-build/scan-build $binDir/scan-build - ln -s $developDir/tools/clang$secondaryArchSuffix/scan-view/scan-view $binDir/scan-view - ln -s $binDir/clang $developDir/tools/clang$secondaryArchSuffix/scan-build/clang - - prepareInstalledDevelLibs libclang - - # analysis package - packageEntries analysis \ - $binDir/scan-build \ - $binDir/scan-view \ - $developDir/tools/clang$secondaryArchSuffix -} - -TEST() -{ - make check -} diff --git a/sys-devel/clang/licenses/UIUC b/sys-devel/clang/licenses/UIUC deleted file mode 100644 index 1b1047ca3..000000000 --- a/sys-devel/clang/licenses/UIUC +++ /dev/null @@ -1,69 +0,0 @@ -============================================================================== -LLVM Release License -============================================================================== -University of Illinois/NCSA -Open Source License - -Copyright (c) 2003-2011 University of Illinois at Urbana-Champaign. -All rights reserved. - -Developed by: - - LLVM Team - - University of Illinois at Urbana-Champaign - - http://llvm.org - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal with -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do -so, subject to the following conditions: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimers. - - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimers in the - documentation and/or other materials provided with the distribution. - - * Neither the names of the LLVM Team, University of Illinois at - Urbana-Champaign, nor the names of its contributors may be used to - endorse or promote products derived from this Software without specific - prior written permission. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE -SOFTWARE. - -============================================================================== -Copyrights and Licenses for Third Party Software Distributed with LLVM: -============================================================================== -The LLVM software contains code written by third parties. Such software will -have its own individual LICENSE.TXT file in the directory in which it appears. -This file will describe the copyrights, license, and restrictions which apply -to that code. - -The disclaimer of warranty in the University of Illinois Open Source License -applies to all code in the LLVM Distribution, and nothing in any of the -other licenses gives permission to use the names of the LLVM Team or the -University of Illinois to endorse or promote products derived from this -Software. - -The following pieces of software have additional or alternate copyrights, -licenses, and/or restrictions: - -Program Directory -------- --------- -Autoconf llvm/autoconf - llvm/projects/ModuleMaker/autoconf - llvm/projects/sample/autoconf -CellSPU backend llvm/lib/Target/CellSPU/README.txt -Google Test llvm/utils/unittest/googletest -OpenBSD regex llvm/lib/Support/{reg*, COPYRIGHT.regex} diff --git a/sys-devel/clang/patches/clang-3.4.patchset b/sys-devel/clang/patches/clang-3.4.patchset deleted file mode 100644 index fe49b7052..000000000 --- a/sys-devel/clang/patches/clang-3.4.patchset +++ /dev/null @@ -1,117 +0,0 @@ -From dbc97e44eaeb44908e8e71edd0f6f64f79cfef3e Mon Sep 17 00:00:00 2001 -From: Alexander von Gluck IV -Date: Fri, 24 Jan 2014 02:22:17 +0000 -Subject: haiku: Fix header search paths - -* /boot/develop no longer exists -* /boot/common no longer exists -* We still need to figure something out - for secondary architecture builds. - -diff --git a/clang-3.4/lib/Frontend/InitHeaderSearch.cpp b/clang-3.4/lib/Frontend/InitHeaderSearch.cpp -index d144cbb..e96e329 100644 ---- a/clang-3.4/lib/Frontend/InitHeaderSearch.cpp -+++ b/clang-3.4/lib/Frontend/InitHeaderSearch.cpp -@@ -272,38 +272,44 @@ void InitHeaderSearch::AddDefaultCIncludePaths(const llvm::Triple &triple, - llvm_unreachable("Include management is handled in the driver."); - - case llvm::Triple::Haiku: -- AddPath("/boot/common/include", System, false); -- AddPath("/boot/develop/headers/os", System, false); -- AddPath("/boot/develop/headers/os/app", System, false); -- AddPath("/boot/develop/headers/os/arch", System, false); -- AddPath("/boot/develop/headers/os/device", System, false); -- AddPath("/boot/develop/headers/os/drivers", System, false); -- AddPath("/boot/develop/headers/os/game", System, false); -- AddPath("/boot/develop/headers/os/interface", System, false); -- AddPath("/boot/develop/headers/os/kernel", System, false); -- AddPath("/boot/develop/headers/os/locale", System, false); -- AddPath("/boot/develop/headers/os/mail", System, false); -- AddPath("/boot/develop/headers/os/media", System, false); -- AddPath("/boot/develop/headers/os/midi", System, false); -- AddPath("/boot/develop/headers/os/midi2", System, false); -- AddPath("/boot/develop/headers/os/net", System, false); -- AddPath("/boot/develop/headers/os/storage", System, false); -- AddPath("/boot/develop/headers/os/support", System, false); -- AddPath("/boot/develop/headers/os/translation", System, false); -- AddPath("/boot/develop/headers/os/add-ons/graphics", System, false); -- AddPath("/boot/develop/headers/os/add-ons/input_server", System, false); -- AddPath("/boot/develop/headers/os/add-ons/screen_saver", System, false); -- AddPath("/boot/develop/headers/os/add-ons/tracker", System, false); -- AddPath("/boot/develop/headers/os/be_apps/Deskbar", System, false); -- AddPath("/boot/develop/headers/os/be_apps/NetPositive", System, false); -- AddPath("/boot/develop/headers/os/be_apps/Tracker", System, false); -- AddPath("/boot/develop/headers/cpp", System, false); -- AddPath("/boot/develop/headers/cpp/i586-pc-haiku", System, false); -- AddPath("/boot/develop/headers/3rdparty", System, false); -- AddPath("/boot/develop/headers/bsd", System, false); -- AddPath("/boot/develop/headers/glibc", System, false); -- AddPath("/boot/develop/headers/posix", System, false); -- AddPath("/boot/develop/headers", System, false); -+ // TODO: We need to handle hybrid secondary architecture paths -+ // (see buildtools/tree/gcc/gcc/config/haiku.h) -+ AddPath("/boot/system/non-packaged/develop/headers", System, false); -+ AddPath("/boot/system/develop/headers/os", System, false); -+ AddPath("/boot/system/develop/headers/os/app", System, false); -+ AddPath("/boot/system/develop/headers/os/arch", System, false); -+ AddPath("/boot/system/develop/headers/os/device", System, false); -+ AddPath("/boot/system/develop/headers/os/drivers", System, false); -+ AddPath("/boot/system/develop/headers/os/game", System, false); -+ AddPath("/boot/system/develop/headers/os/interface", System, false); -+ AddPath("/boot/system/develop/headers/os/kernel", System, false); -+ AddPath("/boot/system/develop/headers/os/locale", System, false); -+ AddPath("/boot/system/develop/headers/os/mail", System, false); -+ AddPath("/boot/system/develop/headers/os/media", System, false); -+ AddPath("/boot/system/develop/headers/os/midi", System, false); -+ AddPath("/boot/system/develop/headers/os/midi2", System, false); -+ AddPath("/boot/system/develop/headers/os/net", System, false); -+ AddPath("/boot/system/develop/headers/os/opengl", System, false); -+ AddPath("/boot/system/develop/headers/os/storage", System, false); -+ AddPath("/boot/system/develop/headers/os/support", System, false); -+ AddPath("/boot/system/develop/headers/os/translation", System, false); -+ AddPath("/boot/system/develop/headers/os/add-ons/graphics", System, false); -+ AddPath("/boot/system/develop/headers/os/add-ons/input_server", System, false); -+ AddPath("/boot/system/develop/headers/os/add-ons/mail_daemon", System, false); -+ AddPath("/boot/system/develop/headers/os/add-ons/registrar", System, false); -+ AddPath("/boot/system/develop/headers/os/add-ons/screen_saver", System, false); -+ AddPath("/boot/system/develop/headers/os/add-ons/tracker", System, false); -+ AddPath("/boot/system/develop/headers/os/be_apps/Deskbar", System, false); -+ AddPath("/boot/system/develop/headers/os/be_apps/NetPositive", System, false); -+ AddPath("/boot/system/develop/headers/os/be_apps/Tracker", System, false); -+ AddPath("/boot/system/develop/headers/cpp", System, false); -+ AddPath("/boot/system/develop/headers/cpp/i586-pc-haiku", System, false); -+ AddPath("/boot/system/develop/headers/3rdparty", System, false); -+ AddPath("/boot/system/develop/headers/bsd", System, false); -+ AddPath("/boot/system/develop/headers/glibc", System, false); -+ AddPath("/boot/system/develop/headers/gnu", System, false); -+ AddPath("/boot/system/develop/headers/posix", System, false); -+ AddPath("/boot/system/develop/headers", System, false); - break; - case llvm::Triple::RTEMS: - break; --- -1.8.3.4 - - -From 67f6c48d61c2350ec3063c373f5c8ad196c456df Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Sun, 18 May 2014 12:41:50 +0200 -Subject: libclang: add soname when building on Haiku. - - -diff --git a/clang-3.4/tools/libclang/Makefile b/clang-3.4/tools/libclang/Makefile -index 43ecbd1..837276d 100644 ---- a/clang-3.4/tools/libclang/Makefile -+++ b/clang-3.4/tools/libclang/Makefile -@@ -29,7 +29,7 @@ USEDLIBS = clangIndex.a clangFrontend.a clangDriver.a \ - include $(CLANG_LEVEL)/Makefile - - # Add soname to the library. --ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU GNU/kFreeBSD)) -+ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU GNU/kFreeBSD Haiku)) - LLVMLibsOptions += -Wl,-soname,lib$(LIBRARYNAME)$(SHLIBEXT) - endif - --- -1.8.3.4 - diff --git a/sys-devel/clang/patches/clang-3.5.1.patchset b/sys-devel/clang/patches/clang-3.5.1.patchset deleted file mode 100644 index a785b4309..000000000 --- a/sys-devel/clang/patches/clang-3.5.1.patchset +++ /dev/null @@ -1,302 +0,0 @@ -From 5cee69285df1bff7c1a8911e2a866457af414f50 Mon Sep 17 00:00:00 2001 -From: Alexander von Gluck IV -Date: Sun, 1 Feb 2015 15:13:57 +0000 -Subject: haiku: fix header search paths - -* /boot/develop no longer exists -* /boot/common no longer exists - -diff --git a/cfe-3.5.1.src/lib/Frontend/InitHeaderSearch.cpp b/cfe-3.5.1.src/lib/Frontend/InitHeaderSearch.cpp -index d2edc94..f91346b 100644 ---- a/cfe-3.5.1.src/lib/Frontend/InitHeaderSearch.cpp -+++ b/cfe-3.5.1.src/lib/Frontend/InitHeaderSearch.cpp -@@ -271,38 +271,41 @@ void InitHeaderSearch::AddDefaultCIncludePaths(const llvm::Triple &triple, - llvm_unreachable("Include management is handled in the driver."); - - case llvm::Triple::Haiku: -- AddPath("/boot/common/include", System, false); -- AddPath("/boot/develop/headers/os", System, false); -- AddPath("/boot/develop/headers/os/app", System, false); -- AddPath("/boot/develop/headers/os/arch", System, false); -- AddPath("/boot/develop/headers/os/device", System, false); -- AddPath("/boot/develop/headers/os/drivers", System, false); -- AddPath("/boot/develop/headers/os/game", System, false); -- AddPath("/boot/develop/headers/os/interface", System, false); -- AddPath("/boot/develop/headers/os/kernel", System, false); -- AddPath("/boot/develop/headers/os/locale", System, false); -- AddPath("/boot/develop/headers/os/mail", System, false); -- AddPath("/boot/develop/headers/os/media", System, false); -- AddPath("/boot/develop/headers/os/midi", System, false); -- AddPath("/boot/develop/headers/os/midi2", System, false); -- AddPath("/boot/develop/headers/os/net", System, false); -- AddPath("/boot/develop/headers/os/storage", System, false); -- AddPath("/boot/develop/headers/os/support", System, false); -- AddPath("/boot/develop/headers/os/translation", System, false); -- AddPath("/boot/develop/headers/os/add-ons/graphics", System, false); -- AddPath("/boot/develop/headers/os/add-ons/input_server", System, false); -- AddPath("/boot/develop/headers/os/add-ons/screen_saver", System, false); -- AddPath("/boot/develop/headers/os/add-ons/tracker", System, false); -- AddPath("/boot/develop/headers/os/be_apps/Deskbar", System, false); -- AddPath("/boot/develop/headers/os/be_apps/NetPositive", System, false); -- AddPath("/boot/develop/headers/os/be_apps/Tracker", System, false); -- AddPath("/boot/develop/headers/cpp", System, false); -- AddPath("/boot/develop/headers/cpp/i586-pc-haiku", System, false); -- AddPath("/boot/develop/headers/3rdparty", System, false); -- AddPath("/boot/develop/headers/bsd", System, false); -- AddPath("/boot/develop/headers/glibc", System, false); -- AddPath("/boot/develop/headers/posix", System, false); -- AddPath("/boot/develop/headers", System, false); -+ AddPath("/boot/system/non-packaged/develop/headers", System, false); -+ AddPath("/boot/system/develop/headers/os", System, false); -+ AddPath("/boot/system/develop/headers/os/app", System, false); -+ AddPath("/boot/system/develop/headers/os/arch", System, false); -+ AddPath("/boot/system/develop/headers/os/device", System, false); -+ AddPath("/boot/system/develop/headers/os/drivers", System, false); -+ AddPath("/boot/system/develop/headers/os/game", System, false); -+ AddPath("/boot/system/develop/headers/os/interface", System, false); -+ AddPath("/boot/system/develop/headers/os/kernel", System, false); -+ AddPath("/boot/system/develop/headers/os/locale", System, false); -+ AddPath("/boot/system/develop/headers/os/mail", System, false); -+ AddPath("/boot/system/develop/headers/os/media", System, false); -+ AddPath("/boot/system/develop/headers/os/midi", System, false); -+ AddPath("/boot/system/develop/headers/os/midi2", System, false); -+ AddPath("/boot/system/develop/headers/os/net", System, false); -+ AddPath("/boot/system/develop/headers/os/opengl", System, false); -+ AddPath("/boot/system/develop/headers/os/storage", System, false); -+ AddPath("/boot/system/develop/headers/os/support", System, false); -+ AddPath("/boot/system/develop/headers/os/translation", System, false); -+ AddPath("/boot/system/develop/headers/os/add-ons/graphics", System, false); -+ AddPath("/boot/system/develop/headers/os/add-ons/input_server", System, false); -+ AddPath("/boot/system/develop/headers/os/add-ons/mail_daemon", System, false); -+ AddPath("/boot/system/develop/headers/os/add-ons/registrar", System, false); -+ AddPath("/boot/system/develop/headers/os/add-ons/screen_saver", System, false); -+ AddPath("/boot/system/develop/headers/os/add-ons/tracker", System, false); -+ AddPath("/boot/system/develop/headers/os/be_apps/Deskbar", System, false); -+ AddPath("/boot/system/develop/headers/os/be_apps/NetPositive", System, false); -+ AddPath("/boot/system/develop/headers/os/be_apps/Tracker", System, false); -+ AddPath("/boot/system/develop/headers/cpp", System, false); -+ AddPath("/boot/system/develop/headers/cpp/i586-pc-haiku", System, false); -+ AddPath("/boot/system/develop/headers/3rdparty", System, false); -+ AddPath("/boot/system/develop/headers/bsd", System, false); -+ AddPath("/boot/system/develop/headers/glibc", System, false); -+ AddPath("/boot/system/develop/headers/posix", System, false); -+ AddPath("/boot/system/develop/headers", System, false); - break; - case llvm::Triple::RTEMS: - break; --- -2.2.2 - - -From 899e1eb7ee73e55e68c4d139c73e7ddc3859d1c5 Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Sun, 1 Feb 2015 15:15:45 +0000 -Subject: libclang: add soname when building on Haiku. - - -diff --git a/cfe-3.5.1.src/tools/libclang/Makefile b/cfe-3.5.1.src/tools/libclang/Makefile -index db3d4f8..149f245 100644 ---- a/cfe-3.5.1.src/tools/libclang/Makefile -+++ b/cfe-3.5.1.src/tools/libclang/Makefile -@@ -33,7 +33,7 @@ USEDLIBS = clangIndex.a clangARCMigrate.a \ - include $(CLANG_LEVEL)/Makefile - - # Add soname to the library. --ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU GNU/kFreeBSD)) -+ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU GNU/kFreeBSD Haiku)) - LLVMLibsOptions += -Wl,-soname,lib$(LIBRARYNAME)$(SHLIBEXT) - endif - --- -2.2.2 - - -From feedddcc5561774a081fecde1feb292a5a410982 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Tue, 22 Dec 2015 22:07:06 +0000 -Subject: don't include c++ headers in C include search paths. - -* define a Haiku toolchain, and add c++ headers path. - -diff --git a/cfe-3.5.1.src/lib/Driver/Driver.cpp b/cfe-3.5.1.src/lib/Driver/Driver.cpp -index ef26bfa..ca1f4c4 100644 ---- a/cfe-3.5.1.src/lib/Driver/Driver.cpp -+++ b/cfe-3.5.1.src/lib/Driver/Driver.cpp -@@ -1982,6 +1982,9 @@ const ToolChain &Driver::getToolChain(const ArgList &Args, - case llvm::Triple::Solaris: - TC = new toolchains::Solaris(*this, Target, Args); - break; -+ case llvm::Triple::Haiku: -+ TC = new toolchains::Haiku(*this, Target, Args); -+ break; - case llvm::Triple::Win32: - switch (Target.getEnvironment()) { - default: -diff --git a/cfe-3.5.1.src/lib/Driver/ToolChains.cpp b/cfe-3.5.1.src/lib/Driver/ToolChains.cpp -index b46f69d..0701013 100644 ---- a/cfe-3.5.1.src/lib/Driver/ToolChains.cpp -+++ b/cfe-3.5.1.src/lib/Driver/ToolChains.cpp -@@ -2429,6 +2429,34 @@ bool TCEToolChain::isPICDefaultForced() const { - return false; - } - -+/// Haiku - Haiku tool chain which can call as(1) and ld(1) directly. -+ -+Haiku::Haiku(const Driver &D, const llvm::Triple& Triple, const ArgList &Args) -+ : Generic_ELF(D, Triple, Args) { -+ -+} -+ -+void Haiku::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs, -+ ArgStringList &CC1Args) const { -+ if (DriverArgs.hasArg(options::OPT_nostdlibinc) || -+ DriverArgs.hasArg(options::OPT_nostdincxx)) -+ return; -+ -+ switch (GetCXXStdlibType(DriverArgs)) { -+ case ToolChain::CST_Libstdcxx: -+ addSystemInclude(DriverArgs, CC1Args, -+ getDriver().SysRoot + "/system/develop/headers/c++"); -+ addSystemInclude(DriverArgs, CC1Args, -+ getDriver().SysRoot + "/system/develop/headers/c++/backward"); -+ -+ StringRef Triple = getTriple().str(); -+ addSystemInclude(DriverArgs, CC1Args, -+ getDriver().SysRoot + "/system/develop/headers/c++/" + -+ Triple); -+ break; -+ } -+} -+ - /// OpenBSD - OpenBSD tool chain which can call as(1) and ld(1) directly. - - OpenBSD::OpenBSD(const Driver &D, const llvm::Triple& Triple, const ArgList &Args) -diff --git a/cfe-3.5.1.src/lib/Driver/ToolChains.h b/cfe-3.5.1.src/lib/Driver/ToolChains.h -index b5df866..add465d 100644 ---- a/cfe-3.5.1.src/lib/Driver/ToolChains.h -+++ b/cfe-3.5.1.src/lib/Driver/ToolChains.h -@@ -528,6 +528,17 @@ protected: - - }; - -+class LLVM_LIBRARY_VISIBILITY Haiku : public Generic_ELF { -+public: -+ Haiku(const Driver &D, const llvm::Triple &Triple, -+ const llvm::opt::ArgList &Args); -+ -+ bool isPIEDefault() const override { return getTriple().getArch() == llvm::Triple::x86_64; } -+ -+ void -+ AddClangCXXStdlibIncludeArgs(const llvm::opt::ArgList &DriverArgs, -+ llvm::opt::ArgStringList &CC1Args) const override; -+}; - - class LLVM_LIBRARY_VISIBILITY OpenBSD : public Generic_ELF { - public: -diff --git a/cfe-3.5.1.src/lib/Frontend/InitHeaderSearch.cpp b/cfe-3.5.1.src/lib/Frontend/InitHeaderSearch.cpp -index f91346b..f778752 100644 ---- a/cfe-3.5.1.src/lib/Frontend/InitHeaderSearch.cpp -+++ b/cfe-3.5.1.src/lib/Frontend/InitHeaderSearch.cpp -@@ -299,8 +299,6 @@ void InitHeaderSearch::AddDefaultCIncludePaths(const llvm::Triple &triple, - AddPath("/boot/system/develop/headers/os/be_apps/Deskbar", System, false); - AddPath("/boot/system/develop/headers/os/be_apps/NetPositive", System, false); - AddPath("/boot/system/develop/headers/os/be_apps/Tracker", System, false); -- AddPath("/boot/system/develop/headers/cpp", System, false); -- AddPath("/boot/system/develop/headers/cpp/i586-pc-haiku", System, false); - AddPath("/boot/system/develop/headers/3rdparty", System, false); - AddPath("/boot/system/develop/headers/bsd", System, false); - AddPath("/boot/system/develop/headers/glibc", System, false); --- -2.2.2 - - -From b04cceb968495b02dd32d305fca9769f22c02bc3 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Thu, 14 Jan 2016 19:19:14 +0000 -Subject: add Haiku target info for x86_64 - - -diff --git a/cfe-3.5.1.src/lib/Basic/Targets.cpp b/cfe-3.5.1.src/lib/Basic/Targets.cpp -index 075f905..09a4776 100644 ---- a/cfe-3.5.1.src/lib/Basic/Targets.cpp -+++ b/cfe-3.5.1.src/lib/Basic/Targets.cpp -@@ -320,6 +320,30 @@ public: - } - }; - -+// Haiku Target -+template -+class HaikuTargetInfo : public OSTargetInfo { -+protected: -+ void getOSDefines(const LangOptions &Opts, const llvm::Triple &Triple, -+ MacroBuilder &Builder) const override { -+ // Haiku defines; list based off of gcc output -+ Builder.defineMacro("__HAIKU__"); -+ Builder.defineMacro("__ELF__"); -+ DefineStd(Builder, "unix", Opts); -+ } -+public: -+ HaikuTargetInfo(const llvm::Triple &Triple) -+ : OSTargetInfo(Triple) { -+ this->SizeType = TargetInfo::UnsignedLong; -+ this->IntPtrType = TargetInfo::SignedLong; -+ this->PtrDiffType = TargetInfo::SignedLong; -+ this->ProcessIDType = TargetInfo::SignedLong; -+ this->TLSSupported = false; -+ this->UserLabelPrefix = ""; -+ -+ } -+}; -+ - // Minix Target - template - class MinixTargetInfo : public OSTargetInfo { -@@ -3210,27 +3234,6 @@ public: - }; - } // end anonymous namespace - --namespace { --// x86-32 Haiku target --class HaikuX86_32TargetInfo : public X86_32TargetInfo { --public: -- HaikuX86_32TargetInfo(const llvm::Triple &Triple) : X86_32TargetInfo(Triple) { -- SizeType = UnsignedLong; -- IntPtrType = SignedLong; -- PtrDiffType = SignedLong; -- ProcessIDType = SignedLong; -- this->UserLabelPrefix = ""; -- this->TLSSupported = false; -- } -- void getTargetDefines(const LangOptions &Opts, -- MacroBuilder &Builder) const override { -- X86_32TargetInfo::getTargetDefines(Opts, Builder); -- Builder.defineMacro("__INTEL__"); -- Builder.defineMacro("__HAIKU__"); -- } --}; --} // end anonymous namespace -- - // RTEMS Target - template - class RTEMSTargetInfo : public OSTargetInfo { -@@ -6321,7 +6324,7 @@ static TargetInfo *AllocateTarget(const llvm::Triple &Triple) { - } - } - case llvm::Triple::Haiku: -- return new HaikuX86_32TargetInfo(Triple); -+ return new HaikuTargetInfo(Triple); - case llvm::Triple::RTEMS: - return new RTEMSX86_32TargetInfo(Triple); - case llvm::Triple::NaCl: -@@ -6363,6 +6366,8 @@ static TargetInfo *AllocateTarget(const llvm::Triple &Triple) { - return new MicrosoftX86_64TargetInfo(Triple); - } - } -+ case llvm::Triple::Haiku: -+ return new HaikuTargetInfo(Triple); - case llvm::Triple::NaCl: - return new NaClTargetInfo(Triple); - default: --- -2.2.2 - diff --git a/sys-devel/clang/patches/llvm-3.4.patchset b/sys-devel/clang/patches/llvm-3.4.patchset deleted file mode 100644 index 0f9980987..000000000 --- a/sys-devel/clang/patches/llvm-3.4.patchset +++ /dev/null @@ -1,47 +0,0 @@ -From 9cc674f2aa0f54b900d1e773a6ffd201c23e4c05 Mon Sep 17 00:00:00 2001 -From: Alexander von Gluck IV -Date: Wed, 22 Jan 2014 05:04:31 +0000 -Subject: haiku: fix Host.h for endian.h - - -diff --git a/include/llvm/Support/Host.h b/include/llvm/Support/Host.h -index 28c4cc7..ab985a4 100644 ---- a/include/llvm/Support/Host.h -+++ b/include/llvm/Support/Host.h -@@ -16,7 +16,7 @@ - - #include "llvm/ADT/StringMap.h" - --#if defined(__linux__) || defined(__GNU__) -+#if defined(__linux__) || defined(__GNU__) || defined(__HAIKU__) - #include - #else - #if !defined(BYTE_ORDER) && !defined(LLVM_ON_WIN32) --- -1.8.3.4 - - -From 577d261e8e74bc442fe75515e043f268db923ed3 Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Sun, 18 May 2014 12:41:16 +0200 -Subject: libLTO: add soname when building on Haiku. - - -diff --git a/tools/lto/Makefile b/tools/lto/Makefile -index cedbee1..5ce530d 100644 ---- a/tools/lto/Makefile -+++ b/tools/lto/Makefile -@@ -22,6 +22,10 @@ ifdef LLVM_VERSION_INFO - CXX.Flags += -DLLVM_VERSION_INFO='"$(LLVM_VERSION_INFO)"' - endif - -+ifeq ($(HOST_OS),Haiku) -+ LLVMLibsOptions := $(LLVMLibsOptions) -Wl,-soname=$(SharedPrefix)LTO$(SHLIBEXT) -+endif -+ - ifeq ($(HOST_OS),Darwin) - # Special hack to allow libLTO to have an offset version number. - ifdef LLVM_LTO_VERSION_OFFSET --- -1.8.3.4 - diff --git a/sys-devel/clang/patches/llvm-3.5.1.patchset b/sys-devel/clang/patches/llvm-3.5.1.patchset deleted file mode 100644 index 0f9980987..000000000 --- a/sys-devel/clang/patches/llvm-3.5.1.patchset +++ /dev/null @@ -1,47 +0,0 @@ -From 9cc674f2aa0f54b900d1e773a6ffd201c23e4c05 Mon Sep 17 00:00:00 2001 -From: Alexander von Gluck IV -Date: Wed, 22 Jan 2014 05:04:31 +0000 -Subject: haiku: fix Host.h for endian.h - - -diff --git a/include/llvm/Support/Host.h b/include/llvm/Support/Host.h -index 28c4cc7..ab985a4 100644 ---- a/include/llvm/Support/Host.h -+++ b/include/llvm/Support/Host.h -@@ -16,7 +16,7 @@ - - #include "llvm/ADT/StringMap.h" - --#if defined(__linux__) || defined(__GNU__) -+#if defined(__linux__) || defined(__GNU__) || defined(__HAIKU__) - #include - #else - #if !defined(BYTE_ORDER) && !defined(LLVM_ON_WIN32) --- -1.8.3.4 - - -From 577d261e8e74bc442fe75515e043f268db923ed3 Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Sun, 18 May 2014 12:41:16 +0200 -Subject: libLTO: add soname when building on Haiku. - - -diff --git a/tools/lto/Makefile b/tools/lto/Makefile -index cedbee1..5ce530d 100644 ---- a/tools/lto/Makefile -+++ b/tools/lto/Makefile -@@ -22,6 +22,10 @@ ifdef LLVM_VERSION_INFO - CXX.Flags += -DLLVM_VERSION_INFO='"$(LLVM_VERSION_INFO)"' - endif - -+ifeq ($(HOST_OS),Haiku) -+ LLVMLibsOptions := $(LLVMLibsOptions) -Wl,-soname=$(SharedPrefix)LTO$(SHLIBEXT) -+endif -+ - ifeq ($(HOST_OS),Darwin) - # Special hack to allow libLTO to have an offset version number. - ifdef LLVM_LTO_VERSION_OFFSET --- -1.8.3.4 -