From nobody Fri Jan 17 09:00:01 2025 X-Original-To: dev-commits-ports-main@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 4YZDFs45cLz5khdx; Fri, 17 Jan 2025 09:00:01 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YZDFs2XvTz48WB; Fri, 17 Jan 2025 09:00:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737104401; 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=xG5M4nkzRbh61/vvLuFSJEW/P3kWq/r2MYHK4wTXu/c=; b=wePeIyQrORQp0YClSIHpxf1wQMnLkriq1WB2XGI7Zx2ZVSYJTMrKKa0XGXZA6kWTASTkLd FAygmrPsdoqHjPhehcv5M4Z8SWxwU87CtOpclRC3EMEJzoIi7Car25eXOD4+5zYDHWlKHd 79TYKeHu8ug5YZuRH58zAK8RDJPUHsOflgHBjR1yWHpsy724oDAs7QqwXstRI5QkRgY/O/ JoIhSNsvceDkAhyWTpL2W1KO+QAlwsBcWu52AxeqTyzjQh/cygIavwmCJxLIoZGQNjWENK SQuZDl7AD2aF+YOjSG8piKNNkoJ+SvNCMYfqwD1ifRD4f+UKDGUOGjqtOFmKFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737104401; 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=xG5M4nkzRbh61/vvLuFSJEW/P3kWq/r2MYHK4wTXu/c=; b=qt5D+4sCe7vVoirojOWtQ/uzU/rIcVuytyznvg5ZMBgNMZgNhifK0+CFFvbVmE0fWhaw91 gltCslMJZLroUAxF54M+J/ytXdOIFoJkA/RNO0GRXMfq0oVhZAwXOCsSW/zMklbtsf1j2u kLaLj8WDxXjQHuBXX+5uHGWTCsSO+YOl+8/i2YtMD/0wgvuAnSokOOr1rhmuW3vm5qSrWz 0kj2eoKNeVikqynrJX0UPtAOiBDJZMcJCdHNVajCpiOUBy8Kcdm0W1H8Ouj+GtEu3DEyaT TFFtnMNDN4C4LpTP6nZ1RHHiU+QOW5Tswk7PhJo2EvjtRRwZNsChJthD2JFrhA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737104401; a=rsa-sha256; cv=none; b=ICqtPckHT76bQF1zsebAmPTQd2ISrWm/oihh2zg/XhxKfg+VHTBMJe1lOpPnQZ6GrilFCG ykbFvc7wGM7K6yDvz613XUFu6gkCIdOonNY5CB83r5CF5NpcrJHy0I2KRTfV0cllRbiNyF PY5wJdxMJsnjJBxStg3v7GRdR9Hl6UQoTmDQppWCuz+M0dwkGW9K7EJx8fLh9XTpFfDs/4 3MqeQgiu7BfnSeUPxpqXFNvA63KS5x0WJeX+H9Fdp0nGnFsYpWO/dJ+EPlASZMX7hc4BiY YvchmmHSP1ytWYVtopA99R+cqqqhzXMcmK/fW8Bv2O3zsavyWO1P0s+DnnitXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YZDFs27Jdz19vC; Fri, 17 Jan 2025 09:00:01 +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 50H901Rb062761; Fri, 17 Jan 2025 09:00:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50H901fN062754; Fri, 17 Jan 2025 09:00:01 GMT (envelope-from git) Date: Fri, 17 Jan 2025 09:00:01 GMT Message-Id: <202501170900.50H901fN062754@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Tijl Coosemans Subject: git: 01d3683c4417 - main - x11/pixman: Make OpenMP optional List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tijl X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 01d3683c441704c1f2ed00c44a41ad94baf72a5b Auto-Submitted: auto-generated The branch main has been updated by tijl: URL: https://cgit.FreeBSD.org/ports/commit/?id=01d3683c441704c1f2ed00c44a41ad94baf72a5b commit 01d3683c441704c1f2ed00c44a41ad94baf72a5b Author: Tijl Coosemans AuthorDate: 2025-01-09 12:18:27 +0000 Commit: Tijl Coosemans CommitDate: 2025-01-17 08:58:19 +0000 x11/pixman: Make OpenMP optional OpenMP is not available when the base system has been built with WITHOUT_OPENMP in src.conf(5). PR: 283949 Reviewed by: manu --- x11/pixman/Makefile | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile index 80b8c0f070c0..ce937e01ad47 100644 --- a/x11/pixman/Makefile +++ b/x11/pixman/Makefile @@ -15,7 +15,13 @@ MESON_ARGS= -Dloongson-mmi=disabled \ -Dgtk=disabled \ -Ddemos=disabled -OPTIONS_DEFINE= TEST +OPTIONS_DEFINE= OPENMP TEST +OPTIONS_DEFAULT= OPENMP +OPTIONS_EXCLUDE_armv6= OPENMP +OPTIONS_EXCLUDE_armv7= OPENMP +OPTIONS_EXCLUDE_powerpc=OPENMP + +OPENMP_MESON_ENABLED= openmp TEST_LIB_DEPENDS= libpng.so:graphics/png TEST_MESON_ENABLED= libpng tests @@ -23,14 +29,12 @@ TEST_MESON_ENABLED= libpng tests .include .if ${ARCH} == armv6 -MESON_ARGS+= -Darm-simd=enabled \ - -Dopenmp=disabled +MESON_ARGS+= -Darm-simd=enabled .else MESON_ARGS+= -Darm-simd=disabled .endif .if ${ARCH} == armv7 -MESON_ARGS+= -Dneon=enabled \ - -Dopenmp=disabled +MESON_ARGS+= -Dneon=enabled .else MESON_ARGS+= -Dneon=disabled .endif @@ -58,9 +62,6 @@ MESON_ARGS+= -Dvmx=enabled .else MESON_ARGS+= -Dvmx=disabled .endif -.if ${ARCH} == powerpc -MESON_ARGS+= -Dopenmp=disabled -.endif .if ${ARCH} == riscv64 MESON_ARGS+= -Drvv=enabled .else