[Bug 276478] Mk/*: Build with a clean environment

[bugzilla-noreply at freebsd.org]

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=276478

--- Comment #21 from commit-hook at FreeBSD.org ---
A commit in branch main references this bug:

URL:
https://cgit.FreeBSD.org/ports/commit/?id=572f2361692640bc27729191b1267aa3fcc354a7

commit 572f2361692640bc27729191b1267aa3fcc354a7
Author:     Tijl Coosemans <tijl at FreeBSD.org>
AuthorDate: 2024-01-20 11:38:46 +0000
Commit:     Tijl Coosemans <tijl at FreeBSD.org>
CommitDate: 2024-02-29 20:21:37 +0000

    Mk/*: Build with a clean environment

    Both our make and gmake use the MAKEFLAGS environment variable but the
    values aren't compatible and the latest version of gmake complains about
    that.  To rule out that any environment variable can cause problems like
    this, add a new command SETENVI=/usr/bin/env -i that clears the
    environment, and use it to run upstream build systems with a clean
    environment.

    Introduce a new variable WRK_ENV that contains the environment to use
    with SETENVI in all targets that run upstream build commands.  Variables
    that are common between CONFIGURE_ENV and MAKE_ENV could be moved to
    WRK_ENV but for now it just contains a minimal environment:

    HOME=${WRKDIR}: Fixes USES=elixir ports that were using the user's HOME.
    OSVERSION: For cross building; determines the output of uname -K and
    getosreldate(3); affects net/freebsd-telnetd for example.
    PATH: Fixes USES=gem ports that were using the user's PATH.
    PWD=$${PWD}: Preserve current working directory; affects USES=go ports.
    TERM: To preserve colored output to terminals.
    TMPDIR: For users who define that.
    UNAME_*: For cross building; determines the output of uname(1); affects
    lang/python* for example.

    This commit deals with everything under Mk/.  Ports that have their own
    targets running upstream build commands can switch to SETENVI later.

    The ports tree adds its definition of ARCH to the MAKEFLAGS environment
    variable, which is interpreted by sub-makes as command line arguments,
    which means that any definition of ARCH in upstream makefiles was
    overridden.  The following ports required fixes now that this is no
    longer the case.

    games/iortcw, games/q3cellshading, games/tremulous:
    These use Quake 3 engine code.  Fix use of ARCH.  Reduce diff between
    FreeBSD code and Linux code.

    games/legesmotus:
    Remove ARCH related patches.

    lang/ocaml:
    Patch configure script so it detects amd64 correctly.  Also make the
    powerpc case consistent with the other architectures.  This also affects
    other ocaml ports like devel/ocaml-ocamlbuild and math/ocaml-num that
    include a Makefile.config installed by lang/ocaml.  While here, use
    SETENVI in check-test target.

    net/libnatpmp:
    Use of upstream definition of ARCH triggers installation in PREFIX/lib64
    on amd64.  Disable this.

    PR:             276478
    Approved by:    portmgr (antoine)
    Exp-run by:     antoine

 CHANGES                                            |  17 +-
 Mk/Uses/angr.mk                                    |   2 +-
 Mk/Uses/cabal.mk                                   |  16 +-
 Mk/Uses/cargo.mk                                   |   5 +-
 Mk/Uses/cmake.mk                                   |   9 +-
 Mk/Uses/elixir.mk                                  |   2 +-
 Mk/Uses/erlang.mk                                  |   2 +-
 Mk/Uses/gem.mk                                     |   8 +-
 Mk/Uses/go.mk                                      |  16 +-
 Mk/Uses/imake.mk                                   |   2 +-
 Mk/Uses/lazarus.mk                                 |   2 +-
 Mk/Uses/mate.mk                                    |   2 +-
 Mk/Uses/perl5.mk                                   |  10 +-
 Mk/Uses/pyqt.mk                                    |   4 +-
 Mk/Uses/pytest.mk                                  |   2 +-
 Mk/Uses/python.mk                                  |  20 +-
 Mk/Uses/qmake.mk                                   |   2 +-
 Mk/Uses/ruby.mk                                    |  10 +-
 Mk/bsd.commands.mk                                 |   1 +
 Mk/bsd.java.mk                                     |   8 +-
 Mk/bsd.port.mk                                     |  25 +-
 games/iortcw/Makefile                              |   6 +-
 games/iortcw/files/patch-MP_Makefile (new)         |  73 ++++++
 .../files/patch-MP_code_qcommon_q__platform.h      |  42 ++--
 games/iortcw/files/patch-SP_Makefile (new)         |  73 ++++++
 .../files/patch-SP_code_qcommon_q__platform.h      |  42 ++--
 games/legesmotus/files/patch-Makefile (gone)       |  11 -
 games/legesmotus/files/patch-common.mk             |  18 +-
 games/q3cellshading/Makefile                       |  19 +-
 games/q3cellshading/files/patch-code-unix-Makefile | 268 ++++++++-------------
 games/tremulous/Makefile                           |   4 +-
 games/tremulous/files/patch-Makefile               | 124 +++++-----
 lang/ocaml/Makefile                                |  16 +-
 lang/ocaml/files/patch-configure                   |  34 ++-
 net/libnatpmp/files/patch-Makefile (new)           |  10 +
 35 files changed, 487 insertions(+), 418 deletions(-)

-- 
You are receiving this mail because:
You are on the CC list for the bug.