From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 669CC1395E2 for ; Fri, 9 Dec 2016 22:45:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5E6D9E0B55; Fri, 9 Dec 2016 22:45:39 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2AA38E0B55 for ; Fri, 9 Dec 2016 22:45:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F2FF4340FC1 for ; Fri, 9 Dec 2016 22:45:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 22F444A0 for ; Fri, 9 Dec 2016 22:45:34 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1481323517.234f6d457396c138cf76dcc8f3973ece14845410.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/glew/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/glew/glew-1.10.0-r100.ebuild media-libs/glew/glew-1.10.0-r2.ebuild media-libs/glew/glew-1.13.0.ebuild media-libs/glew/glew-1.6.0-r100.ebuild media-libs/glew/glew-2.0.0.ebuild X-VCS-Directories: media-libs/glew/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 234f6d457396c138cf76dcc8f3973ece14845410 X-VCS-Branch: master Date: Fri, 9 Dec 2016 22:45:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2b90768e-d3d2-42e5-ad28-75afc8da8042 X-Archives-Hash: ed261c93ed9ff54bb788e62a4fda4fe7 commit: 234f6d457396c138cf76dcc8f3973ece14845410 Author: Mike Frysinger gentoo org> AuthorDate: Fri Dec 9 22:44:31 2016 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Fri Dec 9 22:45:17 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=234f6d45 media-libs/glew: set SYSTEM based on CHOST #595280 This avoids running the local (and old) copy of config.guess, and it fixes cross-compiling selection in a number of cases. media-libs/glew/glew-1.10.0-r100.ebuild | 16 +++++++++++++--- media-libs/glew/glew-1.10.0-r2.ebuild | 13 +++++++++++++ media-libs/glew/glew-1.13.0.ebuild | 16 +++++++++++++--- media-libs/glew/glew-1.6.0-r100.ebuild | 16 +++++++++++++--- media-libs/glew/glew-2.0.0.ebuild | 16 +++++++++++++--- 5 files changed, 65 insertions(+), 12 deletions(-) diff --git a/media-libs/glew/glew-1.10.0-r100.ebuild b/media-libs/glew/glew-1.10.0-r100.ebuild index 8481435..94c237d 100644 --- a/media-libs/glew/glew-1.10.0-r100.ebuild +++ b/media-libs/glew/glew-1.10.0-r100.ebuild @@ -38,20 +38,30 @@ src_prepare() { multilib_copy_sources } +glew_system() { + # Set the SYSTEM variable instead of probing. #523444 #595280 + case ${CHOST} in + *linux*) echo "linux" ;; + *-freebsd*) echo "freebsd" ;; + *-darwin*) echo "darwin" ;; + *-solaris*) echo "solaris" ;; + mingw*|*-mingw*) echo "mingw" ;; + *) die "Unknown system ${CHOST}" ;; + esac +} + set_opts() { myglewopts=( AR="$(tc-getAR)" STRIP=true CC="$(tc-getCC)" LD="$(tc-getCC) ${LDFLAGS}" + SYSTEM="$(glew_system)" M_ARCH="" LDFLAGS.EXTRA="" LDFLAGS.GL="-lGL" # Don't need X libs! POPT="${CFLAGS}" ) - - # support MinGW targets (bug #523444) - [[ ${CHOST} == *-mingw* ]] && myglewopts+=( SYSTEM=mingw ) } multilib_src_compile() { diff --git a/media-libs/glew/glew-1.10.0-r2.ebuild b/media-libs/glew/glew-1.10.0-r2.ebuild index e9519f6..a379531 100644 --- a/media-libs/glew/glew-1.10.0-r2.ebuild +++ b/media-libs/glew/glew-1.10.0-r2.ebuild @@ -46,12 +46,25 @@ src_prepare() { multilib_copy_sources } +glew_system() { + # Set the SYSTEM variable instead of probing. #523444 #595280 + case ${CHOST} in + *linux*) echo "linux" ;; + *-freebsd*) echo "freebsd" ;; + *-darwin*) echo "darwin" ;; + *-solaris*) echo "solaris" ;; + mingw*|*-mingw*) echo "mingw" ;; + *) die "Unknown system ${CHOST}" ;; + esac +} + set_opts() { myglewopts=( AR="$(tc-getAR)" STRIP=true CC="$(tc-getCC)" LD="$(tc-getCC) ${LDFLAGS}" + SYSTEM="$(glew_system)" M_ARCH="" LDFLAGS.EXTRA="" POPT="${CFLAGS}" diff --git a/media-libs/glew/glew-1.13.0.ebuild b/media-libs/glew/glew-1.13.0.ebuild index 28e1345..4b55239 100644 --- a/media-libs/glew/glew-1.13.0.ebuild +++ b/media-libs/glew/glew-1.13.0.ebuild @@ -46,19 +46,29 @@ src_prepare() { multilib_copy_sources } +glew_system() { + # Set the SYSTEM variable instead of probing. #523444 #595280 + case ${CHOST} in + *linux*) echo "linux" ;; + *-freebsd*) echo "freebsd" ;; + *-darwin*) echo "darwin" ;; + *-solaris*) echo "solaris" ;; + mingw*|*-mingw*) echo "mingw" ;; + *) die "Unknown system ${CHOST}" ;; + esac +} + set_opts() { myglewopts=( AR="$(tc-getAR)" STRIP=true CC="$(tc-getCC)" LD="$(tc-getCC) ${LDFLAGS}" + SYSTEM="$(glew_system)" M_ARCH="" LDFLAGS.EXTRA="" POPT="${CFLAGS}" ) - - # support MinGW targets (bug #523444) - [[ ${CHOST} == *-mingw* ]] && myglewopts+=( SYSTEM=mingw ) } multilib_src_compile() { diff --git a/media-libs/glew/glew-1.6.0-r100.ebuild b/media-libs/glew/glew-1.6.0-r100.ebuild index 8481435..94c237d 100644 --- a/media-libs/glew/glew-1.6.0-r100.ebuild +++ b/media-libs/glew/glew-1.6.0-r100.ebuild @@ -38,20 +38,30 @@ src_prepare() { multilib_copy_sources } +glew_system() { + # Set the SYSTEM variable instead of probing. #523444 #595280 + case ${CHOST} in + *linux*) echo "linux" ;; + *-freebsd*) echo "freebsd" ;; + *-darwin*) echo "darwin" ;; + *-solaris*) echo "solaris" ;; + mingw*|*-mingw*) echo "mingw" ;; + *) die "Unknown system ${CHOST}" ;; + esac +} + set_opts() { myglewopts=( AR="$(tc-getAR)" STRIP=true CC="$(tc-getCC)" LD="$(tc-getCC) ${LDFLAGS}" + SYSTEM="$(glew_system)" M_ARCH="" LDFLAGS.EXTRA="" LDFLAGS.GL="-lGL" # Don't need X libs! POPT="${CFLAGS}" ) - - # support MinGW targets (bug #523444) - [[ ${CHOST} == *-mingw* ]] && myglewopts+=( SYSTEM=mingw ) } multilib_src_compile() { diff --git a/media-libs/glew/glew-2.0.0.ebuild b/media-libs/glew/glew-2.0.0.ebuild index 4f9f1c0..3eee345 100644 --- a/media-libs/glew/glew-2.0.0.ebuild +++ b/media-libs/glew/glew-2.0.0.ebuild @@ -49,19 +49,29 @@ src_prepare() { multilib_copy_sources } +glew_system() { + # Set the SYSTEM variable instead of probing. #523444 #595280 + case ${CHOST} in + *linux*) echo "linux" ;; + *-freebsd*) echo "freebsd" ;; + *-darwin*) echo "darwin" ;; + *-solaris*) echo "solaris" ;; + mingw*|*-mingw*) echo "mingw" ;; + *) die "Unknown system ${CHOST}" ;; + esac +} + set_opts() { myglewopts=( AR="$(tc-getAR)" STRIP=true CC="$(tc-getCC)" LD="$(tc-getCC) ${LDFLAGS}" + SYSTEM="$(glew_system)" M_ARCH="" LDFLAGS.EXTRA="" POPT="${CFLAGS}" ) - - # support MinGW targets (bug #523444) - [[ ${CHOST} == *-mingw* ]] && myglewopts+=( SYSTEM=mingw ) } multilib_src_compile() {