Re: PKGSRC_USE_MKTOOLS support added

[Mark Davies <mark%ecs.vuw.ac.nz@localhost>]

On 2/07/22 1:45 am, Jonathan Perkin wrote:
> Are you able to debug this to figure out what's going on?  I don't have 
> any Arch systems to try it on, but am unable to reproduce it on CentOS 
> to at least rule out Linux-specific behaviour (and am running my bulk 
> builds with the option enabled).


Sorry for the delay in getting back to this.  Turns out it was (sort of) 
a local issue.

Many years ago I made the following change to bsd.buildlink3.mk to deal 
with my ArchLinux systems (where LOCALBASE=/usr/pkg and X11BASE=/usr) to 
fix the situation where some things that should have been in .buildlink 
were ending up in .x11-buildlink and not being found during the build



Index: bsd.buildlink3.mk
===================================================================
RCS file: /src/cvs/netbsd/pkgsrc/mk/buildlink3/bsd.buildlink3.mk,v
retrieving revision 1.248
diff -u -r1.248 bsd.buildlink3.mk
--- bsd.buildlink3.mk   7 Jun 2022 10:04:25 -0000       1.248
+++ bsd.buildlink3.mk   21 Jun 2022 04:06:14 -0000
@@ -713,9 +713,13 @@
        fi
 .else
        ${RUN}                                                          \
+       case "${LOCALBASE}" in                                          \
+       ${X11BASE}*)    bl_dir="${BUILDLINK_DIR}" ;;                    \
+       *)              bl_dir="${BUILDLINK_X11_DIR}" ;;                \
+       esac;                                                           \
        case "${BUILDLINK_PREFIX.${_pkg_}}" in                          \
        ${LOCALBASE})   buildlink_dir="${BUILDLINK_DIR}" ;;             \
-       ${X11BASE})     buildlink_dir="${BUILDLINK_X11_DIR}" ;;         \
+       ${X11BASE})     buildlink_dir="$$bl_dir" ;;                     \
        *)              buildlink_dir="${BUILDLINK_DIR}" ;;             \
        esac;                                                           \
        [ -z "${BUILDLINK_PREFIX.${_pkg_}:Q}" ] ||                      \
@@ -780,10 +784,6 @@
        -e 
"/^dependency_libs=/s,\([${_BLNK_SEP}]\)${X11BASE}\(/[^${_BLNK_SEP}]*lib[^/${_BLNK_SEP}]*\.la[${_BLNK_SEP}]\),\\1${_BLNK_MANGLE_DIR.${BUILDLINK_X11_DIR}}\\2,g"
 .endif

-_BLNK_LT_ARCHIVE_FILTER_SED_SCRIPT.${_pkg_}+=                          \
-       -e 
"/^dependency_libs=/s,\([${_BLNK_SEP}]\)${LOCALBASE}\(/[^${_BLNK_SEP}]*lib[^/${_BLNK_SEP}]*\.la[${_BLNK_SEP}]\),\\1${_BLNK_MANGLE_DIR.${BUILDLINK_DIR}}\\2,g" 
\
-       -e 
"/^dependency_libs=/s,\([${_BLNK_SEP}]\)${LOCALBASE}\(/[^${_BLNK_SEP}]*lib[^/${_BLNK_SEP}]*\.la[${_BLNK_SEP}]\),\\1${_BLNK_MANGLE_DIR.${BUILDLINK_DIR}}\\2,g"
-
 #
 # Modify the dependency_libs line by removing -L/usr/lib, which is 
implied.
 #



For some reason I never got around to committing it (or discussing if it 
was in fact the best way to deal with this).
Obviously I need to make an equivalent change to the 
PKGSRC_USE_MKTOOLS=yes case.


cheers
mark