CVS commit: pkgsrc/mk

["David A. Holland" <dholland%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dholland
Date:           Thu Jul 14 23:45:48 UTC 2022

Modified Files:
        pkgsrc/mk: jpeg.buildlink3.mk

Log Message:
Fix jpeg.bl3.mk to include bl3 files outside multiple-include protection.

This makes the library chosen appear in all places it's supposed to in
the buildlink tree instead of just the first time it's mentioned.

Closes PR 47017 (mk/jpeg.bl3.mk is order-dependent)


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/mk/jpeg.buildlink3.mk

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

Modified files:

Index: pkgsrc/mk/jpeg.buildlink3.mk
diff -u pkgsrc/mk/jpeg.buildlink3.mk:1.4 pkgsrc/mk/jpeg.buildlink3.mk:1.5
--- pkgsrc/mk/jpeg.buildlink3.mk:1.4    Sun Mar 21 08:02:27 2021
+++ pkgsrc/mk/jpeg.buildlink3.mk        Thu Jul 14 23:45:48 2022
@@ -1,4 +1,4 @@
-# $NetBSD: jpeg.buildlink3.mk,v 1.4 2021/03/21 08:02:27 wiz Exp $
+# $NetBSD: jpeg.buildlink3.mk,v 1.5 2022/07/14 23:45:48 dholland Exp $
 #
 # This Makefile fragment is meant to be included by packages that
 # require a libjpeg implementation.  jpeg.buildlink3.mk will:
@@ -45,6 +45,14 @@ JPEG_TYPE=   none
 BUILD_DEFS+=           JPEG_DEFAULT
 BUILD_DEFS_EFFECTS+=   JPEGBASE JPEG_TYPE
 
+JPEGBASE=      ${BUILDLINK_PREFIX.${JPEG_TYPE}}
+
+.endif # MK_JPEG_BUILDLINK3_MK
+
+# Include the bl3 files outside the multiple-include protection.  They
+# should get into the buildlink tree each time this file is included,
+# not just the first time.
+
 .if ${JPEG_TYPE} == "none"
 PKG_FAIL_REASON+=      \
        "${_JPEG_TYPE} is not an acceptable libjpeg type for ${PKGNAME}."
@@ -53,7 +61,3 @@ PKG_FAIL_REASON+=     \
 .elif ${JPEG_TYPE} == "libjpeg-turbo"
 .  include "../../graphics/libjpeg-turbo/buildlink3.mk"
 .endif
-
-JPEGBASE=      ${BUILDLINK_PREFIX.${JPEG_TYPE}}
-
-.endif # MK_JPEG_BUILDLINK3_MK