[gentoo-commits] repo/gentoo:master commit in: media-libs/glew/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Mike Frysinger" <vapier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/glew/
Date: Fri,  9 Dec 2016 22:45:34 +0000 (UTC)	[thread overview]
Message-ID: <1481323517.234f6d457396c138cf76dcc8f3973ece14845410.vapier@gentoo> (raw)

commit:     234f6d457396c138cf76dcc8f3973ece14845410
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  9 22:44:31 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> 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() {

next             reply	other threads:[~2016-12-09 22:45 UTC|newest]

Thread overview: 56+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-12-09 22:45 Mike Frysinger [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-12-30  3:04 [gentoo-commits] repo/gentoo:master commit in: media-libs/glew/ Sam James
2023-12-30  3:04 Sam James
2023-12-30  3:04 Sam James
2023-12-30  3:04 Sam James
2023-12-30  3:04 Sam James
2023-08-28 16:14 James Le Cuirot
2023-08-28 16:14 James Le Cuirot
2023-08-28 16:14 James Le Cuirot
2023-07-02 20:28 James Le Cuirot
2023-06-10 10:25 Sam James
2022-08-28  5:06 WANG Xuerui
2021-07-14 16:15 Marek Szuba
2021-03-16 21:28 Sam James
2021-03-16 20:21 Sam James
2021-03-16 20:21 Sam James
2020-07-27 13:54 Sam James
2020-07-25 11:16 Sam James
2020-07-25  8:42 Sergei Trofimovich
2020-07-24 14:32 Sam James
2020-07-24 11:54 Sam James
2020-07-24  7:17 Sam James
2020-05-07 12:42 Lars Wendler
2019-05-20 17:22 Aaron Bauman
2019-02-10 11:51 Mikle Kolyada
2019-02-10 11:51 Mikle Kolyada
2019-02-10 11:51 Mikle Kolyada
2019-02-10 11:51 Mikle Kolyada
2019-02-02 21:17 Sergei Trofimovich
2019-02-02 19:18 Sergei Trofimovich
2019-02-01 14:55 Tobias Klausmann
2019-01-28 19:38 Sergei Trofimovich
2018-10-01 20:55 Andreas Sturmlechner
2018-10-01 20:55 Andreas Sturmlechner
2018-05-30 16:10 Mikle Kolyada
2018-04-21  8:56 Mikle Kolyada
2018-04-07 21:30 Sergei Trofimovich
2018-03-31 17:52 Tobias Klausmann
2018-03-18 12:25 Mikle Kolyada
2018-03-18 11:15 Sergei Trofimovich
2018-03-17 12:17 Sergei Trofimovich
2018-01-18  5:18 Benda XU
2017-08-04  0:43 Tim Harder
2017-05-05 19:10 Markus Meier
2017-04-23 12:40 Agostino Sarubbo
2017-04-22  7:33 Tobias Klausmann
2017-04-19  6:52 Jeroen Roovers
2017-04-01 22:42 Andreas Sturmlechner
2017-04-01 22:42 Andreas Sturmlechner
2017-04-01 22:42 Andreas Sturmlechner
2017-01-04 19:41 Zac Medico
2016-08-10 15:21 James Le Cuirot
2016-07-24 21:23 James Le Cuirot
2016-07-24 21:23 James Le Cuirot
2016-04-12  5:57 Tim Harder
2015-08-25  4:31 Tim Harder

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:8481435 dfblob:94c237d dfblob:e9519f6 dfblob:a379531
dfblob:28e1345 dfblob:4b55239 dfblob:8481435 dfblob:94c237d
dfblob:4f9f1c0 dfblob:3eee345 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: media-libs/glew/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1481323517.234f6d457396c138cf76dcc8f3973ece14845410.vapier@gentoo \
    --to=vapier@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox