pkgsrc-WIP-changes archive

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

gcc10-aux: fix installation. Adapt buildlink3.



Module Name:	pkgsrc-wip
Committed By:	irvise <irvise%irvise.xyz@localhost>
Pushed By:	irvise
Date:		Tue Nov 2 20:06:59 2021 +0100
Changeset:	b2638eb23f5a5d0dff41e113955cd3437d3c27d8

Modified Files:
	gcc10-aux/Makefile
	gcc10-aux/buildlink3.mk

Log Message:
gcc10-aux: fix installation. Adapt buildlink3.

Package should be now ready for review and consideration.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b2638eb23f5a5d0dff41e113955cd3437d3c27d8

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

diffstat:
 gcc10-aux/Makefile      |  2 +-
 gcc10-aux/buildlink3.mk | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diffs:
diff --git a/gcc10-aux/Makefile b/gcc10-aux/Makefile
index 017264b260..70c3a4d501 100644
--- a/gcc10-aux/Makefile
+++ b/gcc10-aux/Makefile
@@ -203,7 +203,7 @@ post-install:
 
 GENERATE_PLIST+= \
 	cd ${DESTDIR}${PREFIX} && \
-	${FIND} ${GCC_SUBPREFIX} \( -type f -o -type l \) -print | ${SORT}
+	${FIND} ${GCC_SUBPREFIX} \( -type f -o -type l \) -print | ${SORT};
 
 # Add gcc6-aux as an explicit dependency. It is needed to bootstrap.
 .include "../../lang/gcc6-aux/buildlink3.mk"
diff --git a/gcc10-aux/buildlink3.mk b/gcc10-aux/buildlink3.mk
index 83df60bfac..9134c19832 100644
--- a/gcc10-aux/buildlink3.mk
+++ b/gcc10-aux/buildlink3.mk
@@ -1,24 +1,24 @@
 # $NetBSD: buildlink3.mk,v 1.1 2020/05/10 15:02:44 maya Exp $
 
-BUILDLINK_TREE+=	gcc10
+BUILDLINK_TREE+=	gcc10-aux
 
-.if !defined(GCC10_BUILDLINK3_MK)
-GCC10_BUILDLINK3_MK:=
+.if !defined(GCC10_AUX_BUILDLINK3_MK)
+GCC10_AUX_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gcc10+=	gcc10>=${_GCC_REQD}
-BUILDLINK_ABI_DEPENDS.gcc10+=	gcc10>=10.0
-BUILDLINK_PKGSRCDIR.gcc10=	../../wip/gcc10-aux
-BUILDLINK_DEPMETHOD.gcc10?=	build
+BUILDLINK_API_DEPENDS.gcc10-aux+=	gcc10-aux>=${_GCC_REQD}
+BUILDLINK_ABI_DEPENDS.gcc10-aux+=	gcc10-aux>=10.0
+BUILDLINK_PKGSRCDIR.gcc10-aux=	../../wip/gcc10-aux
+BUILDLINK_DEPMETHOD.gcc10-aux?=	build
 
-BUILDLINK_PASSTHRU_DIRS+=	${BUILDLINK_PREFIX.gcc10}/gcc10
+BUILDLINK_PASSTHRU_DIRS+=	${BUILDLINK_PREFIX.gcc10-aux}/gcc10-aux
 
-BUILDLINK_FILES.gcc10=		# empty
-BUILDLINK_AUTO_VARS.gcc10=	no
+BUILDLINK_FILES.gcc10-aux=		# empty
+BUILDLINK_AUTO_VARS.gcc10-aux=	no
 
-pkgbase := gcc10
+pkgbase := gcc10-aux
 .include "../../mk/pkg-build-options.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .endif
 
-BUILDLINK_TREE+=	-gcc10
+BUILDLINK_TREE+=	-gcc10-aux


Home | Main Index | Thread Index | Old Index