Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1658505994250360"
MIME-Version: 1.0
Date: Fri, 22 Jul 2022 16:06:34 +0000
From: "Thomas Klausner" <wiz@netbsd.org>
Subject: CVS commit: pkgsrc/archivers/xz
To: pkgsrc-changes@NetBSD.org
Reply-To: wiz@netbsd.org
Message-Id: <20220722160634.ACBAAFB1A@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1658505994250360
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	wiz
Date:		Fri Jul 22 16:06:34 UTC 2022

Modified Files:
	pkgsrc/archivers/xz: builtin.mk

Log Message:
xz: improve builtin logic


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/archivers/xz/builtin.mk

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


--_----------=_1658505994250360
Content-Disposition: inline
Content-Length: 2411
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/archivers/xz/builtin.mk
diff -u pkgsrc/archivers/xz/builtin.mk:1.7 pkgsrc/archivers/xz/builtin.mk:1.8
--- pkgsrc/archivers/xz/builtin.mk:1.7	Fri Jul 22 15:04:17 2022
+++ pkgsrc/archivers/xz/builtin.mk	Fri Jul 22 16:06:34 2022
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.7 2022/07/22 15:04:17 wiz Exp $
+# $NetBSD: builtin.mk,v 1.8 2022/07/22 16:06:34 wiz Exp $
 
 BUILTIN_PKG:=	xz
 
@@ -95,7 +95,7 @@ CHECK_BUILTIN.xz?=	no
 .if !empty(CHECK_BUILTIN.xz:M[nN][oO])
 
 .  if !empty(USE_BUILTIN.xz:M[yY][eE][sS])
-BUILDLINK_FILES.xz+=	lib/pkgconfig/xz.pc
+BUILDLINK_FILES.xz+=	lib/pkgconfig/liblzma.pc
 .  endif
 
 # Fake pkg-config for builtin xz on NetBSD
@@ -112,21 +112,30 @@ override-message-liblzma-pkgconfig:
 	@${STEP_MSG} "Generating pkg-config files for builtin xz package."
 
 override-liblzma-pkgconfig:
-	${RUN}						\
-	${MKDIR} ${BLKDIR_PKGCFG};			\
-	{						\
-	${ECHO} "prefix=${BUILDLINK_PREFIX.xz}";		\
-	${ECHO} "exec_prefix=\$${prefix}";		\
-	${ECHO} "libdir=\$${exec_prefix}/lib";		\
-	${ECHO} "includedir=\$${prefix}/include";	\
-	${ECHO} "";					\
-	${ECHO} "Name: liblzma";			\
-	${ECHO} "Description: Generic purpose data compression library";	\
-	${ECHO} "Version: ${BUILTIN_VERSION.xz}";	\
-	${ECHO} "Libs: ${COMPILER_RPATH_FLAG}\$${libdir} -L\$${libdir} -llzma";	\
-	${ECHO} "Libs.private: -pthread";	\
-	${ECHO} "Cflags: -I\$${includedir}";		\
-	} >> ${BLKDIR_PKGCFG}/${LIBLZMA_PKGCFGF};
+	${RUN}								\
+	dst=${BLKDIR_PKGCFG}/${LIBLZMA_PKGCFGF};			\
+	src=${BUILDLINK_PREFIX.xz:Q}/lib${LIBABISUFFIX}/pkgconfig/liblzma.pc; \
+	if [ ! -f $${dst} ]; then					\
+		if [ -f $${src} ]; then					\
+			${ECHO_BUILDLINK_MSG} "Symlinking $${src}";	\
+			${LN} -sf $${src} $${dst};			\
+		else							\
+			${MKDIR} ${BLKDIR_PKGCFG};			\
+			{						\
+			${ECHO} "prefix=${BUILDLINK_PREFIX.xz}";	\
+			${ECHO} "exec_prefix=\$${prefix}";		\
+			${ECHO} "libdir=\$${exec_prefix}/lib";		\
+			${ECHO} "includedir=\$${prefix}/include";	\
+			${ECHO} "";					\
+			${ECHO} "Name: liblzma";			\
+			${ECHO} "Description: Generic purpose data compression library";	\
+			${ECHO} "Version: ${BUILTIN_VERSION.xz}";	\
+			${ECHO} "Libs: ${COMPILER_RPATH_FLAG}\$${libdir} -L\$${libdir} -llzma";	\
+			${ECHO} "Libs.private: -pthread";		\
+			${ECHO} "Cflags: -I\$${includedir}";		\
+			} > ${BLKDIR_PKGCFG}/${LIBLZMA_PKGCFGF};	\
+		fi;							\
+	fi
 .    endif
 .  endif
 

--_----------=_1658505994250360--