Skip to content

Add libkqueue as a git submodule #109

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

Merged
merged 1 commit into from
Jul 20, 2016
Merged

Conversation

seabaylea
Copy link
Contributor

We added libkqueue as a git submodule to experimental/foundation under PR #76 to pick up a fix that resolves a crash when utilising Dispatch in NSURLSession.

We still have the same issue in the NSURLSession test, so we need to add the git submodule to master as well.

AC_CHECK_HEADER(sys/event.h, [],
[AC_SEARCH_LIBS([kqueue], [kqueue], [],
[AC_MSG_ERROR([unable to find kqueue() function])]
)]
Copy link
Contributor

Choose a reason for hiding this comment

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

Why the change from PKG_CHECKS_MODULES to AC_SEARCH_LIBS? PKG_CHECK_MODULES will define KQUEUE_CFLAGS and KQUEUE_LIBS so you don't have to hardwire them in the makefile

Copy link
Contributor

Choose a reason for hiding this comment

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

@seabaylea is porting my changes, here. I'm trying to remember why I changed this. I think I couldn't get M4 to parse the PKG_CHECKS_MODULES correctly when under an AS_IF - and switched to AC_SEARCH_LIBS instead.

Copy link
Contributor

Choose a reason for hiding this comment

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

Not sure if it is accurate, but I did find this page describing how to use the two together: https://autotools.io/pkgconfig/pkg_check_modules.html

@seabaylea seabaylea force-pushed the kqueue branch 2 times, most recently from 08cb4c6 to ab7d37a Compare July 19, 2016 15:03
@seabaylea
Copy link
Contributor Author

I've switched over/back to using PKG_CHECK_MODULES, which also resolves the KQUEUE_CFLAGS issue for non-submodule builds.

@MadCoder
Copy link
Contributor

sorry you lost that race and conflict, please update.

@seabaylea
Copy link
Contributor Author

@MadCoder Updated to resolve merge conflict.

@MadCoder MadCoder merged commit f8423ec into swiftlang:master Jul 20, 2016
das pushed a commit that referenced this pull request Aug 11, 2016
Add libkqueue as a git submodule

Signed-off-by: Daniel A. Steffen <dsteffen@apple.com>
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.

5 participants