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.

diff --git a/media-libs/glew/glew-1.10.0-r100.ebuild b/media-libs/glew/glew-1.10.0-r100.ebuild
index 848143537767f8c9c26a4340b70daa68c3592865..94c237d34571b334ed174052c51a99494667d1f1 100644 (file)
--- 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 e9519f66a1c5d4a13667a0130e24f5eb235c7c2a..a37953136c5e06329e4f28e1c335deaff6df58c6 100644 (file)
--- 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 28e13456cb4dbcf8c78ba27c0d11768c24da3bff..4b5523957b54b7542fd1d8641cb2d4b2d3dad74b 100644 (file)
--- 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 848143537767f8c9c26a4340b70daa68c3592865..94c237d34571b334ed174052c51a99494667d1f1 100644 (file)
--- 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 4f9f1c05a381d9a3f73efe96d9ff32e9e864826a..3eee34505bcf7259d2b42bbee17813ab5d7e0df3 100644 (file)
--- 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() {