summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2017-03-20 15:21:36 +0100
committerBernard Cafarelli <voyageur@gentoo.org>2017-03-20 15:21:45 +0100
commitdba041e8fb2573dbef409ff9af30c63ae308a874 (patch)
treec4cd2688cec36e7ee8fe252848c7b44afe201838 /gnustep-base
parentdev-php/PEAR-XML_Serializer: Revbump to use new eclass (diff)
downloadgentoo-dba041e8fb2573dbef409ff9af30c63ae308a874.tar.gz
gentoo-dba041e8fb2573dbef409ff9af30c63ae308a874.tar.bz2
gentoo-dba041e8fb2573dbef409ff9af30c63ae308a874.zip
gnustep-base/gnustep-make: inline libobcj.so check, bug #612840
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Diffstat (limited to 'gnustep-base')
-rw-r--r--gnustep-base/gnustep-make/files/testlibobjc.m10
-rw-r--r--gnustep-base/gnustep-make/gnustep-make-2.6.8.ebuild6
2 files changed, 3 insertions, 13 deletions
diff --git a/gnustep-base/gnustep-make/files/testlibobjc.m b/gnustep-base/gnustep-make/files/testlibobjc.m
deleted file mode 100644
index 225113c24d7..00000000000
--- 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 6aa6586dc58..414a690bff1 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