From nobody Fri Apr 04 19:15:12 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZTpG86Dv5z5sGxR; Fri, 04 Apr 2025 19:15:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZTpG85Mf0z3p4Z; Fri, 04 Apr 2025 19:15:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743794112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GyQFRrvmYRKbzYkqVP8wS36hnnd1qDf+RFBe7Rn68Sg=; b=W96oTET9PSwMu9GptTrjTu1JBIC/brmPOucLMkUGI+1c4nBVM5//iiWP30fx6K/9kPt3dq 5jeXzGhF/SwhidiGRRNuGl2MSgpUhfDcn4UasWO45hjz2mqWSg8mOLhL8Sh5chb1heP/70 kHLnxPrxwlFTc3Ar2uR6NkQgZ8oVaEapw2JCNAMa5naCCi9YocrMDKnIsv1GheC8MjIIWM zLCVAZsyobGVSOS3W198wTOtwUyvkXOKRjpM/U9s5I5SxLaOvENrE6ICMI1s81fMv+uxrF jwCXn/43e3UQ1iyDP63bjaVkduue5KwIVb0QdV6l8sBpmiPBfecurONlEqD/uA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743794112; a=rsa-sha256; cv=none; b=fKAqDW56jO42Rf/YE8yfSj4k1SZwzXDRcceBfCzRwyS9VMUu+Vo3ekp7bk5b/JlAVTXqgV 1n4vy/67mKJMF3Q9uUSLbdrpDInZDgA2BwiE5asle5w9/kNQVjXulvoYWw/Y8F0vP4Yz7D YPZHE2QIUjwtYbMf53pEuwSZI3+Y/n3YGIVK6kmMkqjGAPsJCCpDk60DeInVsk7IiZZWMX XGGFrfkOnwuD5DCPtKrYRlAyybxp+2kl7PNmWWex65HdIFF2KrGcvdmZ9bcG0fuSqlqPlG 5we36DtEebDEqS2H9/iYjAks/1AzbltK1Qe3JQ8843FaOpdsi1zXycGWQup+iQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743794112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GyQFRrvmYRKbzYkqVP8wS36hnnd1qDf+RFBe7Rn68Sg=; b=YwkYyucuu11vmaheDDacL1PmFE/8Cwr+0Z6Yt4pezISuzg8Yenl7eQxaZHfiPvfXS+NTDv OUdrQx6oJmB6GzE0w1+ea1Z/tRGlIhOsWLoNtoX/K5O2rvflOqX5BNMRguT4noMzka+8KA O5WY3mN+68RmPLmgZMoxSuJjBGq6+NuJdDN7W1nOsoAocRih3UeyRL9n5nvBj0N972N4we wSXpTykI4WnPXoOsRJNQfNu5y465M88EUsFaccmzOPqrnHAjUdLQo1IT2mMCtaGdsE2i57 iIEMRLhAs84jkgD3T4WarHSAwPVQP2/CcTi4RnmZP14fWnMO/JllmiQen4kYHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZTpG84vT4zyGF; Fri, 04 Apr 2025 19:15:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 534JFCwF093746; Fri, 4 Apr 2025 19:15:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 534JFCgT093743; Fri, 4 Apr 2025 19:15:12 GMT (envelope-from git) Date: Fri, 4 Apr 2025 19:15:12 GMT Message-Id: <202504041915.534JFCgT093743@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 464ad90a6b30 - main - devel/glib20: Override PREFIX for the @bootstrap flavor List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 464ad90a6b30cf06ce90bbdceadcb5875b7b2b2c Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=464ad90a6b30cf06ce90bbdceadcb5875b7b2b2c commit 464ad90a6b30cf06ce90bbdceadcb5875b7b2b2c Author: Gleb Popov AuthorDate: 2025-04-04 08:13:38 +0000 Commit: Gleb Popov CommitDate: 2025-04-04 19:11:59 +0000 devel/glib20: Override PREFIX for the @bootstrap flavor This allows to break the install-time conflict between glib and glib-bootstrap PR: 285863 --- devel/glib20/Makefile | 11 +++++------ devel/gobject-introspection/Makefile | 15 +++++++++++++-- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 55811895ddab..74c94d95816b 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -1,5 +1,6 @@ PORTNAME= glib DISTVERSION= 2.82.4 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= devel MASTER_SITES= GNOME @@ -26,19 +27,19 @@ FLAVORS= default bootstrap FLAVOR?= ${FLAVORS:[1]} FLAVORS_SUB= yes -default_CONFLICTS_INSTALL= glib-bootstrap default_BUILD_DEPENDS= g-ir-scanner:devel/gobject-introspection@bootstrap +default_USES= trigger bootstrap_PKGNAMESUFFIX= -bootstrap -bootstrap_CONFLICTS_INSTALL= glib # iconv:wchar_t - our iconv in base doesn't support utf-8 -> wchar_t (boooo) # (wchar_t is used by glibmm, rawtherapee triggered this) USES= compiler:c11 cpe gettext gnome iconv:wchar_t localbase:ldflags \ - meson perl5 pkgconfig python tar:xz trigger + meson perl5 pkgconfig python tar:xz ${${FLAVOR}_USES} USE_LDCONFIG= yes USE_PERL5= build USE_PYTHON= py3kplist +TRIGGERS= gio-modules glib-schemas MESON_ARGS= -Db_lundef=false \ -Ddefault_library=both \ -Dinstalled_tests=false \ @@ -76,13 +77,11 @@ TEST_MESON_TRUE= tests MESON_ARGS+= -Ddtrace=disabled .if ${FLAVOR:U} == bootstrap -TRIGGERS= MESON_ARGS+= -Dintrospection=disabled -Ddocumentation=false -Dman-pages=disabled OPTIONS_DEFINE= +PREFIX= ${LOCALBASE}/glib-bootstrap PLIST_SUB+= PORTDOCS='@comment ' NLS='@comment ' MANPAGES='@comment ' -PLIST_FILES+= '@dir share/pkg/triggers' .else -TRIGGERS= gio-modules glib-schemas MESON_ARGS+= -Dintrospection=enabled .endif diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile index b6ed766281fe..efd8d48a869b 100644 --- a/devel/gobject-introspection/Makefile +++ b/devel/gobject-introspection/Makefile @@ -23,10 +23,11 @@ default_LIB_DEPENDS= libglib-2.0.so:devel/glib20 default_CONFLICTS_INSTALL= gobject-introspection-bootstrap bootstrap_PKGNAMESUFFIX= -bootstrap -bootstrap_LIB_DEPENDS= libglib-2.0.so:devel/glib20@bootstrap +bootstrap_BUILD_DEPENDS= ${LOCALBASE}/glib-bootstrap/lib/libglib-2.0.so:devel/glib20@bootstrap +bootstrap_RUN_DEPENDS= ${LOCALBASE}/glib-bootstrap/lib/libglib-2.0.so:devel/glib20@bootstrap bootstrap_CONFLICTS_INSTALL= gobject-introspection -USES= bison gettext localbase meson pkgconfig python tar:xz +USES= bison gettext localbase:ldflags meson pkgconfig python tar:xz USE_LDCONFIG= yes MESON_ARGS= -Ddoctool=disabled \ -Dpython=${PYTHON_CMD} @@ -37,6 +38,11 @@ OPTIONS_DEFINE= TEST TEST_MESON_ENABLED= cairo TEST_LIB_DEPENDS= libcairo.so:graphics/cairo +.if ${FLAVOR:U} == bootstrap +MESON_ARGS+= -Dcairo=disabled +OPTIONS_DEFINE= +.endif + .include .if ${PYTHON_REL} >= 31200 @@ -44,6 +50,11 @@ BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLA RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} .endif +.if ${FLAVOR:U} == bootstrap +post-extract: + ${LN} -s ${LOCALBASE}/glib-bootstrap/libdata/pkgconfig ${PKGCONFIG_LINKDIR} +.endif + post-patch: @${REINPLACE_CMD} -e 's|%%PYTHON_CMD%%|${PYTHON_CMD}|' ${WRKSRC}/tools/meson.build