From nobody Fri Oct 29 09:15:54 2021 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 CB5E6181A4AC; Fri, 29 Oct 2021 09:15:54 +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 4HgcGy59dyz4jWv; Fri, 29 Oct 2021 09:15:54 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 8E77414565; Fri, 29 Oct 2021 09:15:54 +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 19T9FsCV028737; Fri, 29 Oct 2021 09:15:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19T9FsiG028735; Fri, 29 Oct 2021 09:15:54 GMT (envelope-from git) Date: Fri, 29 Oct 2021 09:15:54 GMT Message-Id: <202110290915.19T9FsiG028735@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: 027ed04832c4 - main - deskutils/nextcloudclient: Fix build failure when tests are enabled 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 027ed04832c4160ac66139b8769a33d828ee7573 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=027ed04832c4160ac66139b8769a33d828ee7573 commit 027ed04832c4160ac66139b8769a33d828ee7573 Author: Guido Falsi AuthorDate: 2021-10-29 09:13:03 +0000 Commit: Guido Falsi CommitDate: 2021-10-29 09:13:03 +0000 deskutils/nextcloudclient: Fix build failure when tests are enabled Upstream build system tries to include a Linux only library in the build when tests are enabled. This patch has already been accepted upstream. PR: 258119 Approved by: Maintiner timeout Obtained from: https://github.com/nextcloud/desktop/pull/3880 --- deskutils/nextcloudclient/Makefile | 1 - .../files/patch-test_nextcloud__add__test.cmake | 11 +++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/deskutils/nextcloudclient/Makefile b/deskutils/nextcloudclient/Makefile index 57197c93ee57..7fd8e3ddd1c5 100644 --- a/deskutils/nextcloudclient/Makefile +++ b/deskutils/nextcloudclient/Makefile @@ -29,7 +29,6 @@ CMAKE_ARGS= -DBUILD_UPDATER:BOOL=OFF \ -DWITH_STACK_PROTECTOR:BOOL=OFF USE_LDCONFIG= yes -DEBUG= yes USE_GITHUB= yes GH_ACCOUNT= nextcloud GH_PROJECT= desktop diff --git a/deskutils/nextcloudclient/files/patch-test_nextcloud__add__test.cmake b/deskutils/nextcloudclient/files/patch-test_nextcloud__add__test.cmake new file mode 100644 index 000000000000..203bafc64807 --- /dev/null +++ b/deskutils/nextcloudclient/files/patch-test_nextcloud__add__test.cmake @@ -0,0 +1,11 @@ +--- test/nextcloud_add_test.cmake.orig 2021-09-30 11:13:39 UTC ++++ test/nextcloud_add_test.cmake +@@ -23,7 +23,7 @@ macro(nextcloud_add_test test_class) + ) + endif() + +- if (UNIX) ++ if (LINUX) + target_link_libraries(${OWNCLOUD_TEST_CLASS}Test + "${synclib_NAME}_vfs_xattr" + )