CVS commit: pkgsrc/lang

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Tue Aug 15 13:49:17 UTC 2023

Modified Files:
        pkgsrc/lang/gcc10: Makefile.common
        pkgsrc/lang/gcc10-aux: Makefile
        pkgsrc/lang/gcc12: Makefile.common
        pkgsrc/lang/gcc13: Makefile.common
        pkgsrc/lang/gcc6: Makefile
        pkgsrc/lang/gcc8: Makefile

Log Message:
gcc*: replace gnarly cargo-culted extract logic with EXTRACT_ONLY


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/gcc10/Makefile.common
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/gcc10-aux/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/gcc12/Makefile.common
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/gcc13/Makefile.common
cvs rdiff -u -r1.41 -r1.42 pkgsrc/lang/gcc6/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/lang/gcc8/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/gcc10/Makefile.common
diff -u pkgsrc/lang/gcc10/Makefile.common:1.4 pkgsrc/lang/gcc10/Makefile.common:1.5
--- pkgsrc/lang/gcc10/Makefile.common:1.4       Sat Jun  3 13:22:43 2023
+++ pkgsrc/lang/gcc10/Makefile.common   Tue Aug 15 13:49:17 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2023/06/03 13:22:43 riastradh Exp $
+# $NetBSD: Makefile.common,v 1.5 2023/08/15 13:49:17 tnn Exp $
 # used by lang/gcc10-libjit/Makefile
 
 GCC_PKGNAME=           gcc10
@@ -51,9 +51,10 @@ CHECK_PORTABILITY_SKIP+=     contrib/*
 ## For graphite support.
 .if !empty(PKG_OPTIONS:Mgcc-graphite)
 
+EXTRACT_ONLY+= ${ISL16}.tar.bz2
+
 post-extract:
-       ${TAR} -jxf ${DISTDIR}/${ISL16}.tar.bz2 -C ${WRKSRC}
-       ${MV} ${WRKSRC}/${ISL16} ${WRKSRC}/isl
+       ${MV} ${WRKDIR}/${ISL16} ${WRKSRC}/isl
 .endif
 
 CONFIGURE_ARGS+=       --enable-long-long

Index: pkgsrc/lang/gcc10-aux/Makefile
diff -u pkgsrc/lang/gcc10-aux/Makefile:1.6 pkgsrc/lang/gcc10-aux/Makefile:1.7
--- pkgsrc/lang/gcc10-aux/Makefile:1.6  Tue Jun  6 12:41:42 2023
+++ pkgsrc/lang/gcc10-aux/Makefile      Tue Aug 15 13:49:17 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2023/06/06 12:41:42 riastradh Exp $
+# $NetBSD: Makefile,v 1.7 2023/08/15 13:49:17 tnn Exp $
 
 GCC_PKGNAME=           gcc10-aux
 PKGREVISION=           1
@@ -91,9 +91,10 @@ CXX= ${PREFIX}/gcc6-aux/bin/g++
 ## For graphite support.
 .if !empty(PKG_OPTIONS:Mgcc-graphite)
 
+EXTRACT_ONLY+= ${ISL16}.tar.bz2
+
 post-extract:
-       ${TAR} -jxf ${DISTDIR}/${ISL16}.tar.bz2 -C ${WRKSRC}
-       ${MV} ${WRKSRC}/${ISL16} ${WRKSRC}/isl
+       ${MV} ${WRKDIR}/${ISL16} ${WRKSRC}/isl
 .endif
 
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-*)

Index: pkgsrc/lang/gcc12/Makefile.common
diff -u pkgsrc/lang/gcc12/Makefile.common:1.3 pkgsrc/lang/gcc12/Makefile.common:1.4
--- pkgsrc/lang/gcc12/Makefile.common:1.3       Thu Jul  6 12:22:14 2023
+++ pkgsrc/lang/gcc12/Makefile.common   Tue Aug 15 13:49:17 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2023/07/06 12:22:14 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.4 2023/08/15 13:49:17 tnn Exp $
 # used by lang/gcc12-libjit/Makefile
 
 GCC_PKGNAME=           gcc12
@@ -62,9 +62,10 @@ PATCH_DIST_STRIP=    -p1
 ## For graphite support.
 .if !empty(PKG_OPTIONS:Mgcc-graphite)
 
+EXTRACT_ONLY+= ${ISL16}.tar.bz2
+
 post-extract:
-       ${TAR} -jxf ${DISTDIR}/${ISL16}.tar.bz2 -C ${WRKSRC}
-       ${MV} ${WRKSRC}/${ISL16} ${WRKSRC}/isl
+       ${MV} ${WRKDIR}/${ISL16} ${WRKSRC}/isl
 .endif
 
 CONFIGURE_ARGS+=       --enable-long-long

Index: pkgsrc/lang/gcc13/Makefile.common
diff -u pkgsrc/lang/gcc13/Makefile.common:1.2 pkgsrc/lang/gcc13/Makefile.common:1.3
--- pkgsrc/lang/gcc13/Makefile.common:1.2       Sat Jun  3 13:22:43 2023
+++ pkgsrc/lang/gcc13/Makefile.common   Tue Aug 15 13:49:17 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2023/06/03 13:22:43 riastradh Exp $
+# $NetBSD: Makefile.common,v 1.3 2023/08/15 13:49:17 tnn Exp $
 # used by lang/gcc13-libjit/Makefile
 
 GCC_PKGNAME=           gcc13
@@ -62,9 +62,10 @@ CHECK_PORTABILITY_SKIP+=     gcc/configure.o
 ## For graphite support.
 .if !empty(PKG_OPTIONS:Mgcc-graphite)
 
+EXTRACT_ONLY+= ${ISL24}.tar.xz
+
 post-extract:
-       ${TAR} -jxf ${DISTDIR}/${ISL24}.tar.xz -C ${WRKSRC}
-       ${MV} ${WRKSRC}/${ISL24} ${WRKSRC}/isl
+       ${MV} ${WRKDIR}/${ISL24} ${WRKSRC}/isl
 .endif
 
 CONFIGURE_ARGS+=       --enable-long-long

Index: pkgsrc/lang/gcc6/Makefile
diff -u pkgsrc/lang/gcc6/Makefile:1.41 pkgsrc/lang/gcc6/Makefile:1.42
--- pkgsrc/lang/gcc6/Makefile:1.41      Mon Aug 14 05:24:43 2023
+++ pkgsrc/lang/gcc6/Makefile   Tue Aug 15 13:49:17 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2023/08/14 05:24:43 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2023/08/15 13:49:17 tnn Exp $
 
 GCC_PKGNAME=           gcc6
 .include               "version.mk"
@@ -93,9 +93,10 @@ SUBST_SED.fixinc=    -e "s,\./fixinc.sh,-c 
 ## For graphite support.
 .if !empty(PKG_OPTIONS:Mgcc-graphite)
 
+EXTRACT_ONLY+= ${ISL14}.tar.bz2
+
 post-extract:
-       ${TAR} -jxf ${DISTDIR}/${ISL14}.tar.bz2 -C ${WRKSRC}
-       ${MV} ${WRKSRC}/${ISL14} ${WRKSRC}/isl
+       ${MV} ${WRKDIR}/${ISL14} ${WRKSRC}/isl
 .endif
 
 ## For target librarys and libjava programs.

Index: pkgsrc/lang/gcc8/Makefile
diff -u pkgsrc/lang/gcc8/Makefile:1.38 pkgsrc/lang/gcc8/Makefile:1.39
--- pkgsrc/lang/gcc8/Makefile:1.38      Mon Aug 14 05:24:43 2023
+++ pkgsrc/lang/gcc8/Makefile   Tue Aug 15 13:49:17 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2023/08/14 05:24:43 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2023/08/15 13:49:17 tnn Exp $
 
 GCC_PKGNAME=           gcc8
 PKGREVISION=           1
@@ -87,9 +87,10 @@ SUBST_VARS.vars=     MACHINE_GNU_PLATFORM
 ## For graphite support.
 .if !empty(PKG_OPTIONS:Mgcc-graphite)
 
+EXTRACT_ONLY+= ${ISL16}.tar.bz2
+
 post-extract:
-       ${TAR} -jxf ${DISTDIR}/${ISL16}.tar.bz2 -C ${WRKSRC}
-       ${MV} ${WRKSRC}/${ISL16} ${WRKSRC}/isl
+       ${MV} ${WRKDIR}/${ISL16} ${WRKSRC}/isl
 .endif
 
 .if ${MACHINE_PLATFORM:MNetBSD-*-*}