pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/gcc10-libs gcc10-libs: fix buildlink3.mk to not r...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6b3bc907f7da
branches:  trunk
changeset: 442998:6b3bc907f7da
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat Dec 05 09:22:54 2020 +0000

description:
gcc10-libs: fix buildlink3.mk to not refer to gcc8-libs

Noted by Jackson Bryn in PR 55842

diffstat:

 lang/gcc10-libs/buildlink3.mk |  30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)

diffs (56 lines):

diff -r 640ce928d09e -r 6b3bc907f7da lang/gcc10-libs/buildlink3.mk
--- a/lang/gcc10-libs/buildlink3.mk     Sat Dec 05 09:05:36 2020 +0000
+++ b/lang/gcc10-libs/buildlink3.mk     Sat Dec 05 09:22:54 2020 +0000
@@ -1,30 +1,30 @@
-# $NetBSD: buildlink3.mk,v 1.1 2020/09/02 16:14:03 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2020/12/05 09:22:54 wiz Exp $
 
-BUILDLINK_TREE+=       gcc8-libs
+BUILDLINK_TREE+=       gcc10-libs
 
-.if !defined(GCC8_LIBS_BUILDLINK3_MK)
-GCC8_LIBS_BUILDLINK3_MK:=
+.if !defined(GCC10_LIBS_BUILDLINK3_MK)
+GCC10_LIBS_BUILDLINK3_MK:=
 
 .if !empty(USE_PKGSRC_GCC_RUNTIME:M[Yy][Ee][Ss])
-BUILDLINK_API_DEPENDS.gcc8-libs+=      gcc8-libs>=8.3.0
+BUILDLINK_API_DEPENDS.gcc10-libs+=     gcc10-libs>=10.2.0
 .else
-BUILDLINK_API_DEPENDS.gcc8-libs+=      {gcc8,gcc8-libs}>=8.3.0
+BUILDLINK_API_DEPENDS.gcc10-libs+=     {gcc10,gcc10-libs}>=10.2.0
 .endif
-BUILDLINK_PKGSRCDIR.gcc8-libs=         ../../lang/gcc8-libs
-BUILDLINK_DEPMETHOD.gcc8-libs?=                full
+BUILDLINK_PKGSRCDIR.gcc10-libs=                ../../lang/gcc10-libs
+BUILDLINK_DEPMETHOD.gcc10-libs?=               full
 
-BUILDLINK_PASSTHRU_DIRS+=      ${BUILDLINK_PREFIX.gcc8-libs}/gcc8
+BUILDLINK_PASSTHRU_DIRS+=      ${BUILDLINK_PREFIX.gcc10-libs}/gcc10
 
-BUILDLINK_FILES.gcc8-libs=     #empty
-BUILDLINK_AUTO_VARS.gcc8-libs= no
+BUILDLINK_FILES.gcc10-libs=    #empty
+BUILDLINK_AUTO_VARS.gcc10-libs=        no
 
 .if !empty(USE_PKGSRC_GCC_RUNTIME:M[Yy][Ee][Ss])
 # Use custom specs file to ensure we link against pkgsrc libraries.
 SPECS_LIBGCC=          ${WRAPPER_DIR}/specs.libgcc
 WRAPPER_TARGETS+=      ${SPECS_LIBGCC}
 
-LIBGCC_SUBPREFIX=      gcc8
-LIBGCC_PREFIX=         ${BUILDLINK_PREFIX.gcc8-libs}/${LIBGCC_SUBPREFIX}
+LIBGCC_SUBPREFIX=      gcc10
+LIBGCC_PREFIX=         ${BUILDLINK_PREFIX.gcc10-libs}/${LIBGCC_SUBPREFIX}
 GCC_TARGET_MACHINE?=   ${MACHINE_GNU_PLATFORM}
 
 ${SPECS_LIBGCC}:
@@ -41,6 +41,6 @@
 
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
-.endif # GCC8_LIBS_BUILDLINK3_MK
+.endif # GCC10_LIBS_BUILDLINK3_MK
 
-BUILDLINK_TREE+=       -gcc8-libs
+BUILDLINK_TREE+=       -gcc10-libs



Home | Main Index | Thread Index | Old Index