Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix BUILD_TESTING on non Linux unices #3880

Merged
merged 1 commit into from
Oct 12, 2021
Merged

Fix BUILD_TESTING on non Linux unices #3880

merged 1 commit into from
Oct 12, 2021

Conversation

madpilot78
Copy link
Contributor

vfs_xattr is build only if LINUX is defined, but when building tests it is depended upon when UNIX is defined.

This patch requires it only when LINUX is defined.

Copy link

@FlexW FlexW left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks :)

Copy link
Collaborator

@mgallien mgallien left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks

@mgallien
Copy link
Collaborator

@madpilot78 we will need you to rebase otherwise we cannot do a fast forward merge
can you do it ?

vfs_xattr is build only if LINUX is defined, but when building tests it is depended upon when UNIX is defined.

This patch requires it only when LINUX is defined.

Signed-off-by: Guido Falsi <mad@madpilot.net>
@madpilot78
Copy link
Contributor Author

@madpilot78 we will need you to rebase otherwise we cannot do a fast forward merge can you do it ?

Rebased, hope I did everything correctly.

@nextcloud-desktop-bot
Copy link

AppImage file: Nextcloud-PR-3880-5667a6aad2acc5f396e5684b64fa76b44aff467a-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

@mgallien mgallien merged commit 375dc92 into nextcloud:master Oct 12, 2021
@mgallien mgallien added this to the 3.4.0 milestone Oct 12, 2021
@madpilot78 madpilot78 deleted the Fix_Test_Build_Non_Linux branch October 13, 2021 07:46
freebsd-git pushed a commit to freebsd/freebsd-ports that referenced this pull request Oct 29, 2021
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:		nextcloud/desktop#3880
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants