From eff654bef80312c630d53c47365723ec4d7d29bc Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 13 May 2017 15:52:30 +0200 Subject: [PATCH] gcc8: add git recipe. --- ...29.recipe => gcc8-8.0.0_2017_05_12.recipe} | 122 ++++++++---------- ...patchset => gcc-8.0.0_2017_05_12.patchset} | 0 2 files changed, 57 insertions(+), 65 deletions(-) rename sys-devel/gcc/{gcc7-7.0.0_2016_02_29.recipe => gcc8-8.0.0_2017_05_12.recipe} (83%) rename sys-devel/gcc/patches/{gcc-7.0.0_2016_02_29.patchset => gcc-8.0.0_2017_05_12.patchset} (100%) diff --git a/sys-devel/gcc/gcc7-7.0.0_2016_02_29.recipe b/sys-devel/gcc/gcc8-8.0.0_2017_05_12.recipe similarity index 83% rename from sys-devel/gcc/gcc7-7.0.0_2016_02_29.recipe rename to sys-devel/gcc/gcc8-8.0.0_2017_05_12.recipe index 03cfce921..9f732e38d 100644 --- a/sys-devel/gcc/gcc7-7.0.0_2016_02_29.recipe +++ b/sys-devel/gcc/gcc8-8.0.0_2017_05_12.recipe @@ -2,18 +2,16 @@ SUMMARY="C/C++ compiler for target ${effectiveTargetMachineTriple}" DESCRIPTION="The standard compiler for non-legacy Haiku (i.e. for all \ architectures other than x86_gcc2)." HOMEPAGE="http://gcc.gnu.org" - -srcGitRev="abb80251080239f8e058dea1ae0ca011e2c72816" -SOURCE_URI="https://github.com/korli/gcc/archive/$srcGitRev.tar.gz" -CHECKSUM_SHA256="0176a47c07cf0e7229b5f8e6d00d05b544f15145313c986117e94ef4775a3ed2" -REVISION="2" -LICENSE=" - GNU GPL v3 +COPYRIGHT="1988-2017 Free Software Foundation, Inc." +LICENSE="GNU GPL v3 GNU LGPL v3 " -COPYRIGHT="1988-2016 Free Software Foundation, Inc." - -PATCHES="gcc-7.0.0_2016_02_29.patchset" +REVISION="1" +srcGitRev="f58f40a3b2e1e6b1e8c4d83388d2ec76275764d8" +SOURCE_URI="https://github.com/korli/gcc/archive/$srcGitRev.tar.gz" +CHECKSUM_SHA256="5af819d0d81ca1defcd0de33b49dd58efa3b229f33b775b197bfa0772d95601c" +SOURCE_DIR="gcc-$srcGitRev" +PATCHES="gcc-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64 ?arm" SECONDARY_ARCHITECTURES="?x86" @@ -21,30 +19,63 @@ SECONDARY_ARCHITECTURES="?x86" libatomicSoVersion="1" libatomicLibVersion="1.2.0" -libstdcxxSoVersion="6" -libstdcxxLibVersion="6.0.22" - libgccSoVersion="1" libgccLibVersion="1" +libstdcxxSoVersion="6" +libstdcxxLibVersion="6.0.23" + PROVIDES=" - gcc7$secondaryArchSuffix = $portVersion compat >= 7 - cmd:c++$secondaryArchSuffix = $portVersion compat >= 7 - cmd:cc$secondaryArchSuffix = $portVersion compat >= 7 - cmd:cpp$secondaryArchSuffix = $portVersion compat >= 7 - cmd:g++$secondaryArchSuffix = $portVersion compat >= 7 - cmd:gcc$secondaryArchSuffix = $portVersion compat >= 7 - cmd:gcc_7.0.0$secondaryArchSuffix = $portVersion compat >= 7 - cmd:gcov$secondaryArchSuffix = $portVersion compat >= 7 + gcc8$secondaryArchSuffix = $portVersion compat >= 8 + cmd:c++$secondaryArchSuffix = $portVersion compat >= 8 + cmd:cc$secondaryArchSuffix = $portVersion compat >= 8 + cmd:cpp$secondaryArchSuffix = $portVersion compat >= 8 + cmd:g++$secondaryArchSuffix = $portVersion compat >= 8 + cmd:gcc$secondaryArchSuffix = $portVersion compat >= 8 + cmd:gcc_8.0.0$secondaryArchSuffix = $portVersion compat >= 8 + cmd:gcov$secondaryArchSuffix = $portVersion compat >= 8 " REQUIRES=" haiku$secondaryArchSuffix cmd:as$secondaryArchSuffix - lib:libgmp$secondaryArchSuffix >= 10.3.0 - lib:libmpc$secondaryArchSuffix >= 3.0.0 - lib:libmpfr$secondaryArchSuffix >= 4.1.4 + lib:libgmp$secondaryArchSuffix + lib:libmpc$secondaryArchSuffix + lib:libmpfr$secondaryArchSuffix lib:libz$secondaryArchSuffix " + +SUMMARY_syslibs="C/C++-runtime shared libraries, needed to execute C/C++ programs" +DESCRIPTION_syslibs="The C/C++-runtime libraries that are part of the gcc \ +distribution. This package contains the shared libraries for the runtime \ +loader, so it is required for executing most c/c++ programs." +PROVIDES_syslibs=" + gcc8${secondaryArchSuffix}_syslibs = $portVersion compat >= 8 + lib:libatomic$secondaryArchSuffix = $libatomicLibVersion compat >= $libatomicSoVersion + lib:libgcc_s$secondaryArchSuffix = $libgccLibVersion compat >= $libgccSoVersion + lib:libstdc++$secondaryArchSuffix = $libstdcxxLibVersion compat >= $libstdcxxSoVersion + lib:libsupc++$secondaryArchSuffix = $portVersion compat >= 8 + " +REQUIRES_syslibs=" + haiku$secondaryArchSuffix + " + +SUMMARY_syslibs_devel="C/C++-runtime static libraries and C++ headers, needed to build Haiku" +DESCRIPTION_syslibs_devel="This package is not of general interest - it \ +contains the set of gcc's C/C++-runtime libraries and headers that is \ +required by Haiku's build system when building Haiku." +PROVIDES_syslibs_devel=" + gcc8${secondaryArchSuffix}_syslibs_devel = $portVersion compat >= 8 + devel:libatomic$secondaryArchSuffix = $libatomicLibVersion compat >= $libatomicSoVersion + devel:libgcc_kernel$secondaryArchSuffix = $libgccLibVersion compat >= $libgccSoVersion + devel:libgcc$secondaryArchSuffix = $libgccLibVersion compat >= $libgccSoVersion + devel:libgcc_eh_kernel$secondaryArchSuffix = $libgccLibVersion compat >= $libgccSoVersion + devel:libgcc_eh$secondaryArchSuffix = $libgccLibVersion compat >= $libgccSoVersion + devel:libstdc++$secondaryArchSuffix = $libstdcxxLibVersion compat >= $libstdcxxSoVersion + devel:libsupc++$secondaryArchSuffix = $portVersion compat >= 8 + devel:libsupc++_kernel$secondaryArchSuffix = $portVersion compat >= 8 + " +REQUIRES_syslibs_devel="" + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libgmp$secondaryArchSuffix >= 10.3.0 @@ -67,8 +98,6 @@ BUILD_PREREQUIRES=" cmd:xargs " -SOURCE_DIR="gcc-$srcGitRev" - sourceDir=$(pwd) relativeInstallDir="develop/tools$secondaryArchSubDir" installDir="$prefix/$relativeInstallDir" @@ -190,7 +219,7 @@ INSTALL() # libatomic strip --strip-debug $gccLibDir/libatomic.so.$libatomicLibVersion - cp -d $gccLibDir/libstdc++.so \ + cp -d $gccLibDir/libatomic.so \ $gccLibDir/libatomic.so.$libatomicSoVersion \ $gccLibDir/libatomic.so.$libatomicLibVersion \ $libDir/ @@ -278,6 +307,7 @@ INSTALL() ### Sub Packages ########################################## packageEntries "syslibs" \ + $relativeLibDir/libatomic.so \ $relativeLibDir/libatomic.so.$libatomicSoVersion \ $relativeLibDir/libatomic.so.$libatomicLibVersion \ $relativeLibDir/libgcc_s.so \ @@ -301,41 +331,3 @@ INSTALL() rm -rf $includeDir rm -rf $developLibDir } - -# ----- syslibs package ----------------------------------------------------- - -SUMMARY_syslibs="C/C++-runtime shared libraries, needed to execute C/C++ programs" -DESCRIPTION_syslibs="The C/C++-runtime libraries that are part of the gcc \ -distribution. This package contains the shared libraries for the runtime \ -loader, so it is required for executing most c/c++ programs." - -PROVIDES_syslibs=" - gcc7${secondaryArchSuffix}_syslibs = $portVersion compat >= 7 - lib:libatomic$secondaryArchSuffix = $libatomicLibVersion compat >= $libatomicSoVersion - lib:libgcc_s$secondaryArchSuffix = $portVersion compat >= 7 - lib:libstdc++$secondaryArchSuffix = $portVersion compat >= 7 - lib:libsupc++$secondaryArchSuffix = $portVersion compat >= 7 - " -REQUIRES_syslibs=" - haiku$secondaryArchSuffix - " - -# ----- syslibs_devel package ----------------------------------------------- - -SUMMARY_syslibs_devel="C/C++-runtime static libraries and C++ headers, needed to build Haiku" -DESCRIPTION_syslibs_devel="This package is not of general interest - it \ -contains the set of gcc's C/C++-runtime libraries and headers that is \ -required by Haiku's build system when building Haiku." - -PROVIDES_syslibs_devel=" - gcc7${secondaryArchSuffix}_syslibs_devel = $portVersion compat >= 7 - devel:libatomic$secondaryArchSuffix = $libatomicLibVersion compat >= $libatomicSoVersion - devel:libgcc_kernel$secondaryArchSuffix = $portVersion compat >= 7 - devel:libgcc$secondaryArchSuffix = $portVersion compat >= 7 - devel:libgcc_eh_kernel$secondaryArchSuffix = $portVersion compat >= 7 - devel:libgcc_eh$secondaryArchSuffix = $portVersion compat >= 7 - devel:libstdc++$secondaryArchSuffix = $portVersion compat >= 7 - devel:libsupc++$secondaryArchSuffix = $portVersion compat >= 7 - devel:libsupc++_kernel$secondaryArchSuffix = $portVersion compat >= 7 - " -REQUIRES_syslibs_devel="" diff --git a/sys-devel/gcc/patches/gcc-7.0.0_2016_02_29.patchset b/sys-devel/gcc/patches/gcc-8.0.0_2017_05_12.patchset similarity index 100% rename from sys-devel/gcc/patches/gcc-7.0.0_2016_02_29.patchset rename to sys-devel/gcc/patches/gcc-8.0.0_2017_05_12.patchset