diff --git a/srcpkgs/gsl-ucg/patches/detect_gcc_better.patch b/srcpkgs/gsl-ucg/patches/detect_gcc_better.patch index e482c0e59ca..d286a2e5d44 100644 --- a/srcpkgs/gsl-ucg/patches/detect_gcc_better.patch +++ b/srcpkgs/gsl-ucg/patches/detect_gcc_better.patch @@ -1,11 +1,44 @@ ---- src/c.fix 2017-02-10 21:50:13.882583271 -0500 -+++ src/c 2017-02-10 21:55:55.064681445 -0500 -@@ -154,7 +154,7 @@ +--- src/c.orig 2017-09-04 21:17:26.180830076 -0400 ++++ src/c 2017-09-04 21:34:22.561799357 -0400 +@@ -154,8 +154,7 @@ # # Generic modern GCC system # --if [ "$CCNAME" = "gcc" ]; then +-case "$CCNAME" in +-*gcc*) +if [ "$(${CCNAME} --version | grep -c \(GCC\))" -gt 0 ]; then [ -z "$BOOM_MODEL_NOOPT" ] && CCDEBUG="-O2" [ -z "$BOOM_MODEL_NOOPT" ] && CCNODEBUG="$CCNODEBUG -O2" CCOPTS="-D_REENTRANT -D_GNU_SOURCE -Wall -Wno-unused -fno-strict-aliasing" +@@ -212,20 +211,18 @@ + STDLIBS="-lapr $STDLIBS" + fi + fi +- ;; +-*) +-# +-# AIX with xlc +-# +-if [ "$UTYPE" = "AIX" -a "$CCNAME" = "xlc_r" ]; then +- [ -z "$BOOM_MODEL_NOOPT" ] && CCNODEBUG="-O" +- CCNAME="xlc_r" # Use VAC Threaded Mode +- CCPLUS="xlC_r" # Use VAC Threaded Mode +- CCOPTS="$CCOPTS -D_REENTRANT" +- STDLIBS="-lpthread" ++else ++ # ++ # AIX with xlc ++ # ++ if [ "$UTYPE" = "AIX" -a "$CCNAME" = "xlc_r" ]; then ++ [ -z "$BOOM_MODEL_NOOPT" ] && CCNODEBUG="-O" ++ CCNAME="xlc_r" # Use VAC Threaded Mode ++ CCPLUS="xlC_r" # Use VAC Threaded Mode ++ CCOPTS="$CCOPTS -D_REENTRANT" ++ STDLIBS="-lpthread" ++ fi + fi +-;; +-esac + + # Patch together the CC options and defines into one variable + CCOPTS="$CCOPTS $CCDEFINES" diff --git a/srcpkgs/gsl-ucg/template b/srcpkgs/gsl-ucg/template index 2646e84a89a..93158334875 100644 --- a/srcpkgs/gsl-ucg/template +++ b/srcpkgs/gsl-ucg/template @@ -1,6 +1,6 @@ # Template file for 'gsl-ucg' pkgname=gsl-ucg -version=4.1.3 +version=4.1.4 revision=1 wrksrc="gsl-${version}" build_wrksrc="src" @@ -9,9 +9,9 @@ makedepends="pcre-devel" short_desc="Generator Scripting Language - Universal Code Generator" maintainer="Toyam Cox " license="GPL-3" -homepage="https://github.com/imatix/gsl" -distfiles="https://github.com/imatix/gsl/archive/v${version}.tar.gz" -checksum=7e6e503997d576751e7c06dd3dd2b31b7e1d0ee5929512c997746ef70c6ed111 +homepage="https://github.com/zeromq/gsl" +distfiles="https://github.com/zeromq/gsl/archive/v${version}.tar.gz" +checksum=12c81cf0ede5cf7d16bb91ffb7ee5310ab4adfc438b495960cdf086974e9c8d2 nocross="Tries to execute built binary to confirm it works" pre_build() {