[pkgsrc/trunk]: pkgsrc/mk Fix jpeg.bl3.mk to include bl3 files outside multip...

[dholland <dholland%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5640c96ffef3
branches:  trunk
changeset: 381892:5640c96ffef3
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Thu Jul 14 23:45:48 2022 +0000

description:
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)

diffstat:

 mk/jpeg.buildlink3.mk |  14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diffs (32 lines):

diff -r 9a61bd13dcf8 -r 5640c96ffef3 mk/jpeg.buildlink3.mk
--- a/mk/jpeg.buildlink3.mk     Thu Jul 14 22:41:18 2022 +0000
+++ b/mk/jpeg.buildlink3.mk     Thu Jul 14 23:45:48 2022 +0000
@@ -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 @@
 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 @@
 .elif ${JPEG_TYPE} == "libjpeg-turbo"
 .  include "../../graphics/libjpeg-turbo/buildlink3.mk"
 .endif
-
-JPEGBASE=      ${BUILDLINK_PREFIX.${JPEG_TYPE}}
-
-.endif # MK_JPEG_BUILDLINK3_MK