Skip to content

libpwq as git submodule #37

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
Jan 27, 2016

Conversation

dgrove-oss
Copy link
Contributor

On Linux we need recent updates to libpthread_workqueue
to support 6 priority levels instead of 4. To ensure
we get a compatible libpwq version, use git submodules
to get the right source version, change the autotools
to build it as a substep of building libdispatch, and
statically link the libpwq object files into libdispatch.so
to avoid picking up a system libpthread_workqueue.so via
dynamic linking.

The pieces of this commit are:
(1) update INSTALL instrictions.
(2) update configure.ac, Makefile.am to support build
(3) bind submodule to dgrove-oss/libpwq until pending
pull requests are merged upsteam into mheily/libpwq
and we are satisfied that we will not need to make
further adjustments to libpwq.

On Linux we need recent updates to libpthread_workqueue
to support 6 priority levels instead of 4.  To ensure
we get a compatible libpwq version, use git submodules
to get the right source version, change the autotools
to build it as a substep of building libdispatch, and
statically link the libpwq object files into libdispatch.so
to avoid picking up a system libpthread_workqueue.so via
dynamic linking.

The pieces of this commit are:
 (1) update INSTALL instrictions.
 (2) update configure.ac, Makefile.am to support build
 (3) bind submodule to dgrove-oss/libpwq until pending
     pull requests are merged upsteam into mheily/libpwq
     and we are satisfied that we will not need to make
     further adjustments to libpwq.
@@ -0,0 +1,3 @@
[submodule "libpwq"]
path = libpwq
url = https://github.com/dgrove-oss/libpwq.git
Copy link
Contributor

Choose a reason for hiding this comment

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

wasn't this supposed to be upstream now, or am I confused?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

When I did the integration with swift/utils/build-script last week I found some autotools fixes (similar issues as #34 in libdispatch) that need to get upstreamed to libpwq. I have an unmerged pull request open (mheily/libpwq#8) but in the short run I think we should go with my fork until everything is working & integrated into the swift build (there may be more fixes to libpwq that we don't know about yet).

Copy link
Contributor

Choose a reason for hiding this comment

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

fair enough

@MadCoder
Copy link
Contributor

Beside my two questions, patch looks reasonnable

MadCoder added a commit that referenced this pull request Jan 27, 2016
@MadCoder MadCoder merged commit ab7e16c into swiftlang:master Jan 27, 2016
@dgrove-oss dgrove-oss deleted the libpwq-integration-rebase branch January 29, 2016 14:58
das pushed a commit that referenced this pull request Jun 14, 2016
libpwq as git submodule

Signed-off-by: Daniel A. Steffen <[email protected]>
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.

3 participants