Received: by mail.netbsd.org (Postfix, from userid 605) id 52D1684ED1; Wed, 2 May 2018 18:38:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D237284E4C for ; Wed, 2 May 2018 18:38:30 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 6v6vWDGtTr4o for ; Wed, 2 May 2018 18:38:30 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 3AE6184CFC for ; Wed, 2 May 2018 18:38:30 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 34176FBEC; Wed, 2 May 2018 18:38:30 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1525286310122640" MIME-Version: 1.0 Date: Wed, 2 May 2018 18:38:30 +0000 From: "Min Sik Kim" Subject: CVS commit: pkgsrc/lang/gcc7 To: pkgsrc-changes@NetBSD.org Reply-To: minskim@netbsd.org X-Mailer: log_accum Message-Id: <20180502183830.34176FBEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1525286310122640 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: minskim Date: Wed May 2 18:38:30 UTC 2018 Modified Files: pkgsrc/lang/gcc7: options.mk Log Message: lang/gcc7: Refine the condition to enable multilib To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/gcc7/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1525286310122640 Content-Disposition: inline Content-Length: 1041 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/gcc7/options.mk diff -u pkgsrc/lang/gcc7/options.mk:1.2 pkgsrc/lang/gcc7/options.mk:1.3 --- pkgsrc/lang/gcc7/options.mk:1.2 Wed May 10 15:02:29 2017 +++ pkgsrc/lang/gcc7/options.mk Wed May 2 18:38:30 2018 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2017/05/10 15:02:29 jperkin Exp $ +# $NetBSD: options.mk,v 1.3 2018/05/02 18:38:30 minskim Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.${GCC_PKGNAME} PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-c++ gcc-fortran \ @@ -22,8 +22,13 @@ PKG_SUGGESTED_OPTIONS+= gcc-inplace-math ### MULTILIB_SUPPORTED?= unknown .if !empty(MACHINE_PLATFORM:MLinux-*-x86_64) -. if exists(/usr/include/gnu/stubs-64.h) && \ - !exists(/usr/include/gnu/stubs-32.h) +. if exists(/usr/include/x86_64-linux-gnu/gnu) +_GNU_INCLUDE_DIR= /usr/include/x86_64-linux-gnu/gnu +. else +_GNU_INCLUDE_DIR= /usr/include/gnu +. endif +. if exists(${_GNU_INCLUDE_DIR}/stubs-64.h) && \ + !exists(${_GNU_INCLUDE_DIR}/stubs-32.h) MULTILIB_SUPPORTED=No . else MULTILIB_SUPPORTED=Yes --_----------=_1525286310122640--