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() {
