From c71e130ac5cf398a8206d975e3c3d28a8499e3c3 Mon Sep 17 00:00:00 2001
From: miqlas <5569059+extrowerk@users.noreply.github.com>
Date: Sat, 24 Aug 2019 00:41:16 +0200
Subject: [PATCH] GCC: enable objc without objc lib (#3748)

---
 sys-devel/gcc/gcc-7.3.0_2018_05_01.recipe | 10 ++++++----
 sys-devel/gcc/gcc-8.3.0_2019_05_24.recipe |  8 +++++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/sys-devel/gcc/gcc-7.3.0_2018_05_01.recipe b/sys-devel/gcc/gcc-7.3.0_2018_05_01.recipe
index 065f0d256..8349c5de8 100644
--- a/sys-devel/gcc/gcc-7.3.0_2018_05_01.recipe
+++ b/sys-devel/gcc/gcc-7.3.0_2018_05_01.recipe
@@ -5,7 +5,7 @@ HOMEPAGE="https://gcc.gnu.org/"
 COPYRIGHT="1988-2018 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3
 	GNU LGPL v3"
-REVISION="4"
+REVISION="5"
 gccVersion="${portVersion%%_*}"
 SOURCE_URI="https://ftpmirror.gnu.org/gcc/gcc-$gccVersion/gcc-$gccVersion.tar.xz
 	https://ftp.gnu.org/gnu/gcc/gcc-$gccVersion/gcc-$gccVersion.tar.xz"
@@ -61,8 +61,8 @@ REQUIRES="
 	"
 
 SUMMARY_fortran="C/C++-runtime static libraries and C++ headers, needed for gfortran"
-DESCRIPTION_fortran="This package is not of general interest - it contains \
-the set of gcc's C/C++-runtime libraries and headers that is \
+DESCRIPTION_fortran="This package is not of general interest - it \
+contains the set of gcc's C/C++-runtime libraries and headers that is \
 required by gfortran to build fortran source code."
 PROVIDES_fortran="
 	gcc${secondaryArchSuffix}_fortran = $portVersion compat >= 7
@@ -205,7 +205,8 @@ BUILD()
 		--docdir=$docDir --enable-threads=posix \
 		--disable-nls --enable-shared --with-gnu-ld --with-gnu-as \
 		--enable-version-specific-runtime-libs \
-		--enable-languages=c,c++,fortran --enable-lto --enable-frame-pointer \
+		--enable-languages=c,c++,fortran,objc --enable-lto \
+		--enable-frame-pointer \
 		--with-pkgversion=$(echo $portVersion | cut -d_ -f2-) \
 		--enable-__cxa-atexit --with-system-zlib --enable-checking=release \
 		--with-bug-url=http://dev.haiku-os.org/ \
@@ -389,6 +390,7 @@ INSTALL()
 	echo "Cleanup"
 	rm -rf $installDir/info
 	rm -rf $installDir/share
+	rm -rf $installDir/$gccLibDir/*.la
 
 	### Sub Packages ##########################################
 
diff --git a/sys-devel/gcc/gcc-8.3.0_2019_05_24.recipe b/sys-devel/gcc/gcc-8.3.0_2019_05_24.recipe
index 3374a735b..c4fdac406 100644
--- a/sys-devel/gcc/gcc-8.3.0_2019_05_24.recipe
+++ b/sys-devel/gcc/gcc-8.3.0_2019_05_24.recipe
@@ -5,7 +5,7 @@ HOMEPAGE="https://gcc.gnu.org/"
 COPYRIGHT="1988-2019 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3
 	GNU LGPL v3"
-REVISION="5"
+REVISION="6"
 gccVersion="${portVersion%%_*}"
 SOURCE_URI="https://ftpmirror.gnu.org/gcc/gcc-$gccVersion/gcc-$gccVersion.tar.xz
 	https://ftp.gnu.org/gnu/gcc/gcc-$gccVersion/gcc-$gccVersion.tar.xz"
@@ -123,7 +123,7 @@ REQUIRES_syslibs_devel=""
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libgmp$secondaryArchSuffix >= 10.3.0
-	devel:libmpc$secondaryArchSuffix >= 3.0.0
+	devel:libmpc$secondaryArchSuffix >= 3.1.0
 	devel:libmpfr$secondaryArchSuffix >= 4.1.4
 	devel:libz$secondaryArchSuffix
 	"
@@ -207,7 +207,8 @@ BUILD()
 		--docdir=$docDir --enable-threads=posix \
 		--disable-nls --enable-shared --with-gnu-ld --with-gnu-as \
 		--enable-version-specific-runtime-libs \
-		--enable-languages=c,c++,fortran --enable-lto --enable-frame-pointer \
+		--enable-languages=c,c++,fortran,objc --enable-lto \
+		--enable-frame-pointer \
 		--with-pkgversion=$(echo $portVersion | cut -d_ -f2-) \
 		--enable-__cxa-atexit --with-system-zlib --enable-checking=release \
 		--with-bug-url=http://dev.haiku-os.org/ \
@@ -402,6 +403,7 @@ INSTALL()
 	echo "Cleanup"
 	rm -rf $installDir/info
 	rm -rf $installDir/share
+	rm -rf $installDir/$gccLibDir/*.la
 
 	### Sub Packages ##########################################