From nobody Mon Dec 12 04:57:44 2022 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 4NVqBJ5CyDz4jmH8; Mon, 12 Dec 2022 04:57:44 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NVqBJ4dSsz3FJJ; Mon, 12 Dec 2022 04:57:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670821064; 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=8HWAnsZwD7crblcy6Dd6EkUTFZr+obB14ZUP4iqeFr0=; b=fSMWZiO6afHp9UDmhZwjmTfJqAhw7HFzFPodIMJNPVMajysufAwUWVYJMp0FhGDB1aR/lf ffSLZA/J2JvbuMvpDPOpoxIddO7i4xxqpG9OcmTqmNdPD2VYLyu8MiJFr85s4wDzHWuGaO 7LC/K1vkPBbWjOMAyj4ZZlwAnbKgHOUy75ZGgYnajKyJ27r8GPoLTbEyMKxJ8S7UuxQK4r JHbaeFql6UgCzNnP0hAqkOasoRkJwqJ4URKbwdzcj/J4f5jOQLL56aEd+sUnCMGvV3R2Rn iwo8IgLFyyZbSup2nHSXfPv9jyixu66jdiOChoXhWxQWgJeoj44X6wDB2flA6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670821064; 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=8HWAnsZwD7crblcy6Dd6EkUTFZr+obB14ZUP4iqeFr0=; b=Xf9gS2JY4x9XVgJf4lxYE7DPHIYR4iF0JUMe6UgjMTEI2QckOVrHjFmn4d67vFvFsmA6wy LENHj8XI3bfsaSE5h9SMKF2apmwB2Z+VlqukcDHco9KUx0FdZe6x/QfH4PPEsIkFVs5gz4 PYkSkUrfh+VUqO+k6QIlKYaJjtUWMlardFbXeUZOr4qgKUhngc2hAMrVizKX1jzVxonYeE n5Zl/B4XJdLArhL8m47OcLg7DaBxM08nP6JTo+C7SiU44EUOzxjTYL35ieqY6+dX8hBJ/D Bomy49654jHdUyoirTzpdkfjcu8MOIuabfId476fS0coQWfHWS+o9Fh3XlnVeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670821064; a=rsa-sha256; cv=none; b=RGWWzHhRct1lM3YYChElKB2pweclR4QhRBh/J4Ajpy8c+0cBYx/zb2hT5vRfyelDWBiUnE z7m0WBaChCFsajMZe1rsrELOK0qtpVjeo5mdNoEaG4PKz/YaYrF/Jp3q2hGrf/i3Ka8I5q QNpv6zXRT5bHAAU/w4kmtXuRxp0NrL89ZfDq+nuEAQSPdbgKXMi1saL+2rHhyRDn8+5KPA 7YAM7ammCTkqwFxDAhvRkC9bA4SiU+WQojQ4sc0K0/8nzbc8HqaySrMXlFd3vWkCELwdGJ mXhy71x1W8QuTAMY/IkM1TaottLgh1Hb9V/dY7rD5l6pljmAaPTA9uIXtbMKlw== 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 4NVqBJ3dxMzM92; Mon, 12 Dec 2022 04:57:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BC4viOQ041315; Mon, 12 Dec 2022 04:57:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BC4vicY041314; Mon, 12 Dec 2022 04:57:44 GMT (envelope-from git) Date: Mon, 12 Dec 2022 04:57:44 GMT Message-Id: <202212120457.2BC4vicY041314@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 8aeaf7a6c115 - main - cad/nvc: Combine conditional clauses for different architectures 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8aeaf7a6c115479384803e1e6e61b08633551946 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=8aeaf7a6c115479384803e1e6e61b08633551946 commit 8aeaf7a6c115479384803e1e6e61b08633551946 Author: Yuri Victorovich AuthorDate: 2022-12-12 04:56:23 +0000 Commit: Yuri Victorovich CommitDate: 2022-12-12 04:57:42 +0000 cad/nvc: Combine conditional clauses for different architectures Reported by: pkubaj@ --- cad/nvc/Makefile | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/cad/nvc/Makefile b/cad/nvc/Makefile index 9404d23dc65b..78cd9633a5e8 100644 --- a/cad/nvc/Makefile +++ b/cad/nvc/Makefile @@ -35,11 +35,6 @@ LDFLAGS+= -lexecinfo CONFIGURE_ARGS= --with-llvm=${LOCALBASE}/bin/llvm-config${LLVM_VERSION} -.include -.if ${ARCH} == "i386" # see the bug#268319 for the LTO failure on i386 -CONFIGURE_ARGS+= --disable-lto # workaround for https://github.com/nickg/nvc/issues/579 (undefined symbol: _GLOBAL_OFFSET_TABLE_, see error: undefined symbol: _GLOBAL_OFFSET_TABLE_) -.endif - TEST_TARGET= check # several tests fail, see https://github.com/nickg/nvc/issues/530 TEST_WRKSRC= ${WRKSRC}/.build @@ -56,8 +51,8 @@ CONFIGURE_CMD= ${WRKSRC}/configure .include -.if ${ARCH} == powerpc64 -CONFIGURE_ARGS+= --enable-lto=no +.if ${ARCH} == "i386" || ${ARCH} == powerpc64 # see the bug#268319 for the LTO failure on i386 +CONFIGURE_ARGS+= --disable-lto # workaround for https://github.com/nickg/nvc/issues/579 (undefined symbol: _GLOBAL_OFFSET_TABLE_, see error: undefined symbol: _GLOBAL_OFFSET_TABLE_) .endif post-install: