Re: OpenBSD/amd64 / pkgtools/pkg_install - pkg_add compatible_platform() check oddness

["Sevan / Venture37" <venture37%gmail.com@localhost>]

On 29 May 2015 at 02:38, Sevan / Venture37 <venture37%gmail.com@localhost> wrote:
> I had, then I moved onto just hardcoding values e.g.
>         machine_arch=x86_64
>         set_machine_arch=yes
>         bmakexargs="MACHINE_ARCH=$machine_arch"
>
> Still no joy.

Ignoring the rest of the infrastructure and focusing on pkgtools/pkg_install
I went about hardcoding MACHINE_ARCH to see what it takes to pass the
check_platform() test, hardcoding MACHINE_ARCH (changes below) had no
effect despite it being set.
Setting effective_arch = "x86_64"; in add/perform.c allowed thing to pass.
I'm a little confused by how MACHINE_ARCH chould be overwritten or
does bmake's variable take priority (if so, these statements are
redundant are they not?)

Sevan

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pkg_install/Makefile,v
retrieving revision 1.208
diff -u -p -u -r1.208 Makefile
--- Makefile    21 Apr 2015 00:28:19 -0000      1.208
+++ Makefile    31 May 2015 23:56:55 -0000
@@ -76,7 +76,7 @@ CPPFLAGS+=            -D_FILE_OFFSET_BITS=64

 CPPFLAGS+=             -DDEF_UMASK=${DEF_UMASK}

-MAKE_ENV+=             MACHINE_ARCH=${MACHINE_ARCH}
+MAKE_ENV+=             MACHINE_ARCH="x86_64"
 MAKE_ENV+=             OPSYS=${OPSYS}
 MAKE_ENV+=             CATMAN_SECTION_SUFFIX=${CATMAN_SECTION_SUFFIX:Q}
 MAKE_ENV+=             MANINSTALL=${MANINSTALL:Q}


Index: files/add/Makefile.in
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pkg_install/files/add/Makefile.in,v
retrieving revision 1.29
diff -u -p -u -r1.29 Makefile.in
--- files/add/Makefile.in       22 Jan 2015 09:19:47 -0000      1.29
+++ files/add/Makefile.in       31 May 2015 23:56:55 -0000
@@ -14,7 +14,7 @@ cat1dir=      $(mandir)/cat1
 CC=            @CC@
 CCLD=          $(CC)
 CPPFLAGS=      @CPPFLAGS@ -I. -I$(srcdir) -I../lib
-DEFS=          @DEFS@ -DOPSYS_NAME=\"$(OPSYS)\"
-DMACHINE_ARCH=\"$(MACHINE_ARCH)\" -DBINDIR=\"$(sbindir)\"
+DEFS=          @DEFS@ -DOPSYS_NAME=\"$(OPSYS)\"
-DMACHINE_ARCH=\"x86_64\" -DBINDIR=\"$(sbindir)\"
 CFLAGS=                @CFLAGS@
 LDFLAGS=       @LDFLAGS@ -L../lib