CVS commit: pkgsrc

["Dmytro Kazankov" <dkazankov%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dkazankov
Date:           Wed Jul 30 19:22:49 UTC 2025

Modified Files:
        pkgsrc/lang/gcc13-gnat: buildlink3.mk
        pkgsrc/lang/gcc14-gnat: buildlink3.mk
        pkgsrc/lang/gcc15-gnat: buildlink3.mk
        pkgsrc/mk/compiler: gcc.mk

Log Message:
gcc*-gnat: add ADA_INCLUDE_PATH definition

Move buildlink ADA_PROJECT_PATH from gcc.mk to buildlink3.mk files


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/gcc13-gnat/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/gcc14-gnat/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/gcc15-gnat/buildlink3.mk
cvs rdiff -u -r1.296 -r1.297 pkgsrc/mk/compiler/gcc.mk

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

Modified files:

Index: pkgsrc/lang/gcc13-gnat/buildlink3.mk
diff -u pkgsrc/lang/gcc13-gnat/buildlink3.mk:1.5 pkgsrc/lang/gcc13-gnat/buildlink3.mk:1.6
--- pkgsrc/lang/gcc13-gnat/buildlink3.mk:1.5    Wed Jul  9 17:10:43 2025
+++ pkgsrc/lang/gcc13-gnat/buildlink3.mk        Wed Jul 30 19:22:48 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2025/07/09 17:10:43 dkazankov Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2025/07/30 19:22:48 dkazankov Exp $
 
 BUILDLINK_TREE+=       gcc13-gnat
 
@@ -10,8 +10,14 @@ BUILDLINK_ABI_DEPENDS.gcc13-gnat+=   gcc13
 BUILDLINK_PKGSRCDIR.gcc13-gnat?=       ../../lang/gcc13-gnat
 BUILDLINK_DEPMETHOD.gcc13-gnat?=       build
 
+ADA_PROJECT_PATH=      ${BUILDLINK_DIR}/lib/gnat
+MAKE_ENV+=             ADA_PROJECT_PATH=${ADA_PROJECT_PATH}
+
 ADALIB_BASE=           lib/gcc/${MACHINE_GNU_PLATFORM}/13.4.0
 
+ADA_INCLUDE_PATH=      ${BUILDLINK_DIR}/include:${BUILDLINK_DIR}/${ADALIB_BASE}/adainclude:${BUILDLINK_DIR}/${ADALIB_BASE}/include
+MAKE_ENV+=             ADA_INCLUDE_PATH=${ADA_INCLUDE_PATH}
+
 BUILDLINK_FNAME_TRANSFORM.gcc13-gnat+= -e "s|^${BUILDLINK_DIR}/gcc13-gnat/|${BUILDLINK_DIR}/|g"
 
 BUILDLINK_INCDIRS.gcc13-gnat+= gcc13-gnat/include

Index: pkgsrc/lang/gcc14-gnat/buildlink3.mk
diff -u pkgsrc/lang/gcc14-gnat/buildlink3.mk:1.3 pkgsrc/lang/gcc14-gnat/buildlink3.mk:1.4
--- pkgsrc/lang/gcc14-gnat/buildlink3.mk:1.3    Wed Jul  9 17:24:08 2025
+++ pkgsrc/lang/gcc14-gnat/buildlink3.mk        Wed Jul 30 19:22:48 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2025/07/09 17:24:08 dkazankov Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2025/07/30 19:22:48 dkazankov Exp $
 
 BUILDLINK_TREE+=       gcc14-gnat
 
@@ -10,8 +10,14 @@ BUILDLINK_ABI_DEPENDS.gcc14-gnat+=   gcc14
 BUILDLINK_PKGSRCDIR.gcc14-gnat?=       ../../lang/gcc14-gnat
 BUILDLINK_DEPMETHOD.gcc14-gnat?=       build
 
+ADA_PROJECT_PATH=      ${BUILDLINK_DIR}/lib/gnat
+MAKE_ENV+=             ADA_PROJECT_PATH=${ADA_PROJECT_PATH}
+
 ADALIB_BASE=           lib/gcc/${MACHINE_GNU_PLATFORM}/14.3.0
 
+ADA_INCLUDE_PATH=      ${BUILDLINK_DIR}/include:${BUILDLINK_DIR}/${ADALIB_BASE}/adainclude:${BUILDLINK_DIR}/${ADALIB_BASE}/include
+MAKE_ENV+=             ADA_INCLUDE_PATH=${ADA_INCLUDE_PATH}
+
 BUILDLINK_FNAME_TRANSFORM.gcc14-gnat+= -e "s|^${BUILDLINK_DIR}/gcc14-gnat/|${BUILDLINK_DIR}/|g"
 
 BUILDLINK_INCDIRS.gcc14-gnat+= gcc14-gnat/include

Index: pkgsrc/lang/gcc15-gnat/buildlink3.mk
diff -u pkgsrc/lang/gcc15-gnat/buildlink3.mk:1.1 pkgsrc/lang/gcc15-gnat/buildlink3.mk:1.2
--- pkgsrc/lang/gcc15-gnat/buildlink3.mk:1.1    Thu Jul 17 05:00:16 2025
+++ pkgsrc/lang/gcc15-gnat/buildlink3.mk        Wed Jul 30 19:22:48 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2025/07/17 05:00:16 dkazankov Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2025/07/30 19:22:48 dkazankov Exp $
 
 BUILDLINK_TREE+=       gcc15-gnat
 
@@ -10,8 +10,14 @@ BUILDLINK_API_DEPENDS.gcc15-gnat+=   gcc15
 BUILDLINK_PKGSRCDIR.gcc15-gnat?=       ../../lang/gcc15-gnat
 BUILDLINK_DEPMETHOD.gcc15-gnat?=       build
 
+ADA_PROJECT_PATH=      ${BUILDLINK_DIR}/lib/gnat
+MAKE_ENV+=             ADA_PROJECT_PATH=${ADA_PROJECT_PATH}
+
 ADALIB_BASE=           lib/gcc/${MACHINE_GNU_PLATFORM}/15.1.0
 
+ADA_INCLUDE_PATH=      ${BUILDLINK_DIR}/include:${BUILDLINK_DIR}/${ADALIB_BASE}/adainclude:${BUILDLINK_DIR}/${ADALIB_BASE}/include
+MAKE_ENV+=             ADA_INCLUDE_PATH=${ADA_INCLUDE_PATH}
+
 BUILDLINK_FNAME_TRANSFORM.gcc15-gnat+= -e "s|^${BUILDLINK_DIR}/gcc15-gnat/|${BUILDLINK_DIR}/|g"
 
 BUILDLINK_INCDIRS.gcc15-gnat+= gcc15-gnat/include

Index: pkgsrc/mk/compiler/gcc.mk
diff -u pkgsrc/mk/compiler/gcc.mk:1.296 pkgsrc/mk/compiler/gcc.mk:1.297
--- pkgsrc/mk/compiler/gcc.mk:1.296     Mon Jul 28 07:31:41 2025
+++ pkgsrc/mk/compiler/gcc.mk   Wed Jul 30 19:22:49 2025
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.296 2025/07/28 07:31:41 dkazankov Exp $
+# $NetBSD: gcc.mk,v 1.297 2025/07/30 19:22:49 dkazankov Exp $
 #
 # This is the compiler definition for the GNU Compiler Collection.
 #
@@ -1315,8 +1315,6 @@ GNAT_PREFIX=              ${PREFIX}/${_GCC_PKGBASE}
 GNAT_NAME=             ${_GNAT_NAME}
 PLIST_SUBST+=          GNAT_PKGBASE="${_GCC_PKGBASE}"
 PRINT_PLIST_AWK+=      { gsub(/${_GCC_PKGBASE}/, "$${GNAT_PKGBASE}"); }
-ADA_PROJECT_PATH=      ${BUILDLINK_DIR}/lib/gnat
-MAKE_ENV+=             ADA_PROJECT_PATH=${ADA_PROJECT_PATH}
 .endif
 
 # Prepend the path to the compiler to the PATH.