Re: git: a43271661481 - main - golang: do not collect data from wrong freebsd binary

Reply: Baptiste Daroussin : "Re: git: a43271661481 - main - golang: do not collect data from wrong freebsd binary"
In reply to: Baptiste Daroussin : "git: a43271661481 - main - golang: do not collect data from wrong freebsd binary"
Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Nuno Teixeira <eduardo_at_freebsd.org>
Date: Fri, 07 Mar 2025 16:28:13 UTC
Hello Baptiste,

Since revert of go* tests removal, problem came back again:

Warning: go123-1.23.7_3 will be rebuilt as it misses libc.so.6:32

Same for all go versions.

Thanks,

Baptiste Daroussin <bapt@freebsd.org> escreveu (quinta, 6/03/2025 à(s)
19:24):

> The branch main has been updated by bapt:
>
> URL:
> https://cgit.FreeBSD.org/ports/commit/?id=a4327166148114c314ae5dd6f9c7e6776178e0ac
>
> commit a4327166148114c314ae5dd6f9c7e6776178e0ac
> Author:     Baptiste Daroussin <bapt@FreeBSD.org>
> AuthorDate: 2025-03-06 17:15:34 +0000
> Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
> CommitDate: 2025-03-06 19:24:20 +0000
>
>     golang: do not collect data from wrong freebsd binary
>
>     Reviewed by:            bdrewery
>     Differential Revision:  https://reviews.freebsd.org/D49260
> ---
>  Mk/bsd.port.mk         | 7 +++++++
>  lang/go-devel/Makefile | 1 +
>  lang/go120/Makefile    | 2 +-
>  lang/go121/Makefile    | 2 +-
>  lang/go122/Makefile    | 2 +-
>  lang/go123/Makefile    | 2 +-
>  lang/go124/Makefile    | 2 +-
>  7 files changed, 13 insertions(+), 5 deletions(-)
>
> diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
> index 32752e31b2e6..062cc040b706 100644
> --- a/Mk/bsd.port.mk
> +++ b/Mk/bsd.port.mk
> @@ -1902,6 +1902,13 @@ PLIST_FILES+=    "@ldconfig"
>  .      endif
>  .    endif
>
> +.    if defined(NO_SHLIB_REQUIRES_GLOB)
> +PKG_ENV+=      SHLIB_REQUIRE_IGNORE_GLOB="${NO_SHLIB_REQUIRES_GLOB:ts,}"
> +.    endif
> +.    if defined(NO_SHLIBS_REQUIRES_REGEX)
> +PKG_ENV+=
> SHLIB_REQUIRE_IGNORE_REGEX="${NO_SHLIBS_REQUIRES_REGEX:ts,}"
> +.    endif
> +
>  PKG_IGNORE_DEPENDS?=           'this_port_does_not_exist'
>
>  .    if defined(_DESTDIR_VIA_ENV)
> diff --git a/lang/go-devel/Makefile b/lang/go-devel/Makefile
> index dd06c43f44fc..4007125f8d58 100644
> --- a/lang/go-devel/Makefile
> +++ b/lang/go-devel/Makefile
> @@ -32,6 +32,7 @@ TEST_DEPENDS_aarch64= binutils>0:devel/binutils
>  USES=          cpe shebangfix
>
>  CPE_VENDOR=    golang
> +NO_SHLIBS_REQUIRES_GLOB=       */gcc-386-freebsd-exec
>
>  .ifndef MASTERDIR
>  USE_GITHUB=    yes
> diff --git a/lang/go120/Makefile b/lang/go120/Makefile
> index 51e0c4c4a855..76adbb62bad0 100644
> --- a/lang/go120/Makefile
> +++ b/lang/go120/Makefile
> @@ -1,6 +1,6 @@
>  DISTVERSION=   1.20.14
>  # Always set PORTREVISION explicitly as otherwise they are inherited from
> lang/go-devel
> -PORTREVISION=  2
> +PORTREVISION=  3
>  MASTER_SITES=  https://golang.org/dl/ \
>
> https://github.com/dmgk/go-bootstrap/releases/download/${BOOTSTRAP_TAG}/:bootstrap
> \
>                 LOCAL/dmgk:bootstrap
> diff --git a/lang/go121/Makefile b/lang/go121/Makefile
> index 4982e3ed3f94..b420920b67e9 100644
> --- a/lang/go121/Makefile
> +++ b/lang/go121/Makefile
> @@ -1,6 +1,6 @@
>  DISTVERSION=   1.21.13
>  # Always set PORTREVISION explicitly as otherwise they are inherited from
> lang/go-devel
> -PORTREVISION=  2
> +PORTREVISION=  3
>  MASTER_SITES=  https://golang.org/dl/ \
>
> https://github.com/dmgk/go-bootstrap/releases/download/${BOOTSTRAP_TAG}/:bootstrap
> \
>                 LOCAL/dmgk:bootstrap
> diff --git a/lang/go122/Makefile b/lang/go122/Makefile
> index 86eeb9fe87ed..fe306720c110 100644
> --- a/lang/go122/Makefile
> +++ b/lang/go122/Makefile
> @@ -1,6 +1,6 @@
>  DISTVERSION=   1.22.12
>  # Always set PORTREVISION explicitly as otherwise they are inherited from
> lang/go-devel
> -PORTREVISION=  1
> +PORTREVISION=  2
>  MASTER_SITES=  https://golang.org/dl/ \
>
> https://github.com/dmgk/go-bootstrap/releases/download/${BOOTSTRAP_TAG}/:bootstrap
> \
>                 LOCAL/dmgk:bootstrap
> diff --git a/lang/go123/Makefile b/lang/go123/Makefile
> index 69bbaa69d3c1..547bf5cf6b1e 100644
> --- a/lang/go123/Makefile
> +++ b/lang/go123/Makefile
> @@ -1,6 +1,6 @@
>  DISTVERSION=   1.23.7
>  # Always set PORTREVISION explicitly as otherwise they are inherited from
> lang/go-devel
> -PORTREVISION=  1
> +PORTREVISION=  2
>  MASTER_SITES=  https://golang.org/dl/ \
>
> https://github.com/dmgk/go-bootstrap/releases/download/${BOOTSTRAP_TAG}/:bootstrap
> \
>                 LOCAL/dmgk:bootstrap
> diff --git a/lang/go124/Makefile b/lang/go124/Makefile
> index 451733d48ec8..d45fa6d42f65 100644
> --- a/lang/go124/Makefile
> +++ b/lang/go124/Makefile
> @@ -1,6 +1,6 @@
>  DISTVERSION=   1.24.1
>  # Always set PORTREVISION explicitly as otherwise they are inherited from
> lang/go-devel
> -PORTREVISION=  0
> +PORTREVISION=  1
>  MASTER_SITES=  https://golang.org/dl/
>  DISTFILES=     go${DISTVERSION}.src.tar.gz \
>                 go1.23.7.${OPSYS:tl}-${GOARCH_${ARCH}}.tar.gz
>


-- 
Nuno Teixeira
FreeBSD UNIX:  <eduardo@FreeBSD.org>   Web:  https://FreeBSD.org