From: Bernard Cafarelli <voyageur@gentoo.org>
Date: Mon, 20 Mar 2017 14:21:36 +0000 (+0100)
Subject: gnustep-base/gnustep-make: inline libobcj.so check, bug #612840
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=dba041e8fb2573dbef409ff9af30c63ae308a874;p=gentoo.git

gnustep-base/gnustep-make: inline libobcj.so check, bug #612840

Package-Manager: Portage-2.3.5, Repoman-2.3.2
---

diff --git a/gnustep-base/gnustep-make/files/testlibobjc.m b/gnustep-base/gnustep-make/files/testlibobjc.m
deleted file mode 100644
index 225113c24d7e..000000000000
--- a/gnustep-base/gnustep-make/files/testlibobjc.m
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * Use "gcc -Werror -Wl,-l:libobjc.so.x testlibobjc.m -o /dev/null" 
- * #import generates a warning with non-objc
- */
-#import <stdio.h>
-
-int main( int argc, const char *argv[] ) {
-    printf("Linker test\n");
-    return 0;
-}
diff --git a/gnustep-base/gnustep-make/gnustep-make-2.6.8.ebuild b/gnustep-base/gnustep-make/gnustep-make-2.6.8.ebuild
index 6aa6586dc58d..414a690bff16 100644
--- a/gnustep-base/gnustep-make/gnustep-make-2.6.8.ebuild
+++ b/gnustep-base/gnustep-make/gnustep-make-2.6.8.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit gnustep-base eutils prefix toolchain-funcs
+inherit gnustep-base prefix toolchain-funcs
 
 DESCRIPTION="GNUstep Makefile Package"
 HOMEPAGE="http://www.gnustep.org"
@@ -32,8 +32,8 @@ pkg_setup() {
 		# Find version in active gcc
 		for ver in {2..5};
 		do
-			if $(tc-getCC) -Werror -Wl,-l:libobjc.so.${ver} \
-				"${FILESDIR}"/testlibobjc.m -o /dev/null 2> /dev/null;
+			if $(tc-getCC) -Werror -Wl,-l:libobjc.so.${ver} -x objective-c \
+				- <<<$'int main() {}' -o /dev/null 2> /dev/null;
 			then
 				libobjc_version=libobjc.so.${ver}
 			fi