[pkgsrc/trunk]: pkgsrc/lang/gcc5-aux lang/gcc5-aux: fix allstages logic and s...

[marino <marino%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/aec95ddb2ec3
branches:  trunk
changeset: 355239:aec95ddb2ec3
user:      marino <marino%pkgsrc.org@localhost>
date:      Sat Nov 26 16:12:18 2016 +0000

description:
lang/gcc5-aux: fix allstages logic and set gcc-aux paths => gcc5-aux

The disable bootstrap logic was reversed, and there were several
references to gcc-aux that needed to change to gcc5-aux.

diffstat:

 lang/gcc5-aux/Makefile         |  16 ++++++++--------
 lang/gcc5-aux/Makefile.version |   4 ++--
 lang/gcc5-aux/files/diff-core  |   2 +-
 lang/gcc5-aux/options.mk       |   4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diffs (100 lines):

diff -r 305a0500ef44 -r aec95ddb2ec3 lang/gcc5-aux/Makefile
--- a/lang/gcc5-aux/Makefile    Sat Nov 26 14:16:30 2016 +0000
+++ b/lang/gcc5-aux/Makefile    Sat Nov 26 16:12:18 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/08/28 17:59:36 marino Exp $
+# $NetBSD: Makefile,v 1.4 2016/11/26 16:12:18 marino Exp $
 #
 
 PKGNAME=       gcc5-aux-${SNAPSHOT}
@@ -36,7 +36,7 @@
 BLD_TARGET=            ${GARCH}-aux-${LOWER_OPSYS}${OS_VERSION}
 OS_LABEL4VERS=         [${OPSYS}${GARCH:M*64:S/amd_//:S/x86_//}]
 FULL_GNATGCC=          NOT SET
-FULL_PATH=             /sbin:/bin:/usr/sbin:/usr/bin:${PREFIX}/gcc-aux/bin:${PREFIX}/sbin:${PREFIX}/bin
+FULL_PATH=             /sbin:/bin:/usr/sbin:/usr/bin:${PREFIX}/gcc5-aux/bin:${PREFIX}/sbin:${PREFIX}/bin
 
 .if ${OPSYS} == DragonFly
 BOOTSTRAP_COMPILER=    ada-bootstrap.${GARCH}.dragonfly.41.tar.bz2
@@ -131,11 +131,11 @@
 BSFILENAME=            ada-bootstrap.${GARCH}.${LOWER_OPSYS}.${OS_VERSION:C/[A-Z_.-]//g}.tar
 
 
-# testing if gcc-aux is already installed - if so, use this compiler along with
+# testing if gcc5-aux is already installed - if so, use this compiler along with
 # its gnatlink, gnatbind, and gnatmake rather than the older bootstrap versions
-.if exists(${LOCALBASE}/gcc-aux/bin/ada)
-FULL_GNATGCC=${LOCALBASE}/gcc-aux/bin/ada
-FULL_GNATGXX=${LOCALBASE}/gcc-aux/bin/g++
+.if exists(${LOCALBASE}/gcc5-aux/bin/ada)
+FULL_GNATGCC=${LOCALBASE}/gcc5-aux/bin/ada
+FULL_GNATGXX=${LOCALBASE}/gcc5-aux/bin/g++
 .endif
 
 
@@ -231,7 +231,7 @@
          ${WRKSRC}/gcc/ada/gcc-interface/Makefile.in
 .  endif
 .endif
-.if !exists(${LOCALBASE}/gcc-aux/bin/ada) && ${OPSYS} == SunOS
+.if !exists(${LOCALBASE}/gcc5-aux/bin/ada) && ${OPSYS} == SunOS
        # In case /usr/pkg/bin/gas doesn't exist, establish fallback
        ${LN} -s ${PREFIX}/bin/gas ${BOOTSTRAP_PREFIX}/bin/as
 .endif
@@ -239,7 +239,7 @@
        # elfdump was present on OmniOS but not in Joyent dev area
        ${PERL5} -i -pe 's|/usr/ccs/bin|/usr/bin|g;' \
          -pe 's|readelf -s|greadelf -s|' ${WRKSRC}/contrib/make_sunver.pl
-       # Update LINK_SPEC to add gcc-aux lib runpath in every binary
+       # Update LINK_SPEC to add gcc5-aux lib runpath in every binary
        @${ECHO} "Configuring LINK_SPEC runpath"
        ${PERL5} -pi -e 's;\@PREFIX\@;${PREFIX};' \
          ${WRKSRC}/gcc/config/dragonfly.h \
diff -r 305a0500ef44 -r aec95ddb2ec3 lang/gcc5-aux/Makefile.version
--- a/lang/gcc5-aux/Makefile.version    Sat Nov 26 14:16:30 2016 +0000
+++ b/lang/gcc5-aux/Makefile.version    Sat Nov 26 16:12:18 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.version,v 1.3 2016/08/28 17:59:36 marino Exp $
+# $NetBSD: Makefile.version,v 1.4 2016/11/26 16:12:18 marino Exp $
 #
 
 SNAPSHOT=      20160603
@@ -6,7 +6,7 @@
 GCC_POINT=     4.0
 GCC_VERSION=   ${GCC_BRANCH}.${GCC_POINT}
 BUILD_RELEASE= yes
-MAIN_PR=       0
+MAIN_PR=       1
 
 .if ${BUILD_RELEASE:Mno}
 # Snapshot naming pattern
diff -r 305a0500ef44 -r aec95ddb2ec3 lang/gcc5-aux/files/diff-core
--- a/lang/gcc5-aux/files/diff-core     Sat Nov 26 14:16:30 2016 +0000
+++ b/lang/gcc5-aux/files/diff-core     Sat Nov 26 16:12:18 2016 +0000
@@ -295,7 +295,7 @@
  #undef LINK_SPEC
 -#define LINK_SPEC NETBSD_LINK_SPEC_ELF
 +#define LINK_SPEC NETBSD_LINK_SPEC_ELF \
-+"%{!static:-rpath @PREFIX@/gcc-aux/lib}"
++"%{!static:-rpath @PREFIX@/gcc5-aux/lib}"
  
  #define NETBSD_ENTRY_POINT "__start"
  
diff -r 305a0500ef44 -r aec95ddb2ec3 lang/gcc5-aux/options.mk
--- a/lang/gcc5-aux/options.mk  Sat Nov 26 14:16:30 2016 +0000
+++ b/lang/gcc5-aux/options.mk  Sat Nov 26 16:12:18 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2016/11/24 15:43:38 marino Exp $
+# $NetBSD: options.mk,v 1.4 2016/11/26 16:12:18 marino Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gcc5-aux
 PKG_SUPPORTED_OPTIONS=  fortran objc testsuite static bootstrap allstages
@@ -110,7 +110,7 @@
 EXTRA_CONFARGS+= --with-system-zlib
 .  endif
 .else
-.  if !empty(PKG_OPTIONS:Mallstages)
+.  if empty(PKG_OPTIONS:Mallstages)
 EXTRA_CONFARGS+= --disable-bootstrap
 EXTRA_CONFARGS+= --disable-libcc1
 .  endif