From 234f6d457396c138cf76dcc8f3973ece14845410 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 9 Dec 2016 17:44:31 -0500 Subject: 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(-) (limited to 'media-libs/glew') diff --git a/media-libs/glew/glew-1.10.0-r100.ebuild b/media-libs/glew/glew-1.10.0-r100.ebuild index 848143537767..94c237d34571 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 e9519f66a1c5..a37953136c5e 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 28e13456cb4d..4b5523957b54 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 848143537767..94c237d34571 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 4f9f1c05a381..3eee34505bcf 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() { -- cgit v1.2.3-65-gdbad