From nobody Mon Dec 18 09:01:17 2023 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 4Stv253n7cz54Bds; Mon, 18 Dec 2023 09:01:17 +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 4Stv253Hmwz4N3V; Mon, 18 Dec 2023 09:01:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702890077; 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=VbYXZecihU+ZipsFqnuiRCb8+wRsMk//c6i5P8yy58I=; b=XJMrdlY+YYRIIWWKq/tNDI3hKvE9toimvc+yXhPuwjksZcynY3B+cQRt1vYhlpBqR7LTE5 56RbPe7zowr2TwGGlTg+B3r3dpGizojZtwUtmf32nwQ4PDLIx/P3uGkzg7gDCTpNrl3GJp RijJRV6AIfuhyBpuJ1sTHxZwm12VFHxaUPcHVYmBz9boVKFABnHN4tnGOH2o+8+PMqiCCj KwnJyCMIKBaa53b7IPCxTl3FDFPggeb2krpKQ27SAJPxMCNVGcPUkylzQO9Za73XX5rBms QF3lNL7/aQPz1NAaCTVd/mLVc5xcRBXYcyQGfHhO5Dtp+gyKJCTgtgDu5BjQPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702890077; a=rsa-sha256; cv=none; b=AqbyCaCgzecgQVsMudtp9jdi7VnHECJTMSf4lphuUYWAeg6AiYiGvqRtFFb7xEq5s41nvO zTtHkcxETmQWw/oAgimURF50R738HsYI2dvlYFkxASGdkHl3jv2vCybRUW/mizxdNqdjP7 yAp5/LAjEIIUfIDc+BPWmx7FeFt7UI/CgLhNFHA/eozaceMLS9pv5R+IS/9lzZDaRJ2lCe VMC9xq6ByuoL/rj9p/obqP1JOnlL5oKCy3eren3N4ZFWzPp7zA4yBcI6gSAxGVNcVe+Nuh tf06T4FvDcxSlzC8I23cesVPwtrTP71CW3VqLfRj9yF6IkrZyNC0slVUiflERw== 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=1702890077; 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=VbYXZecihU+ZipsFqnuiRCb8+wRsMk//c6i5P8yy58I=; b=awHQpLQ6DCUWQJhXYu9VIOagkDL06wY8y9/yTO2aMl1b7l8pWLJn9X5JaEAZCBwYEK5skt M7VGMU0sP5aCs0vn1n7vmLFP7WfVOuuYPXfA4OkrRQ0skkgqh5A9WeKHfis6CftGs3M9Wb Dygjy8HZSJCmsAUzCTnhlQUzs2AWtP11wA7V0/UoyVhS+y3sL3B4Fer4JGVet02v7AjwR8 3XoFzfD547JmBzb1lRM9opBp9GlQdMCKzNlZKWemyJnTmonYUUTIa7fJxVJYucPYSU123t iRypd5W6o2UjJWz3wTkyt48Z0SLyFa5vqxfLF30uxayO0zt7Y8g1piloVdUJ+Q== 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 4Stv252N5vzS7; Mon, 18 Dec 2023 09:01:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BI91HTt063310; Mon, 18 Dec 2023 09:01:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BI91HCR063307; Mon, 18 Dec 2023 09:01:17 GMT (envelope-from git) Date: Mon, 18 Dec 2023 09:01:17 GMT Message-Id: <202312180901.3BI91HCR063307@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Don Lewis Subject: git: f25b169ac895 - main - editors/openoffice-*: Unbreak build on 15.0-CURRENT 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: truckman X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f25b169ac89578f18a6e480d4d84284bb8085316 Auto-Submitted: auto-generated The branch main has been updated by truckman: URL: https://cgit.FreeBSD.org/ports/commit/?id=f25b169ac89578f18a6e480d4d84284bb8085316 commit f25b169ac89578f18a6e480d4d84284bb8085316 Author: Don Lewis AuthorDate: 2023-12-18 08:52:02 +0000 Commit: Don Lewis CommitDate: 2023-12-18 08:56:38 +0000 editors/openoffice-*: Unbreak build on 15.0-CURRENT clang version 17.0.6 causes linker errors that break the build on 15.0-CURRENT. Work around this by building with an older llvm from ports. PR: 275820 --- editors/openoffice-4/Makefile | 8 ++++++++ editors/openoffice-devel/Makefile | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile index 39d192072f3e..05a8bc8e9eca 100644 --- a/editors/openoffice-4/Makefile +++ b/editors/openoffice-4/Makefile @@ -198,6 +198,14 @@ TARGET_ORDER_OVERRIDE= 710:gnome-post-icons WITH= SDK .endif +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1500005 +# linker error when compiling with llvm 17.0.6 on CURRENT +USES+= llvm:max=16 +CHOSEN_COMPILER_TYPE= clang +.endif + .include .if ${OPSYS} == FreeBSD && ( \ diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile index 79d9cbcea32d..c6b574bf6cd2 100644 --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -230,6 +230,14 @@ TARGET_ORDER_OVERRIDE= 710:gnome-post-icons WITH= SDK .endif +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1500005 +# linker error when compiling with llvm 17.0.6 on CURRENT +USES+= llvm:max=16 +CHOSEN_COMPILER_TYPE= clang +.endif + .include .if ${OPSYS} == FreeBSD && ( \