Skip to content

Commit df08133

Browse files
dgrove-ossdas
authored andcommitted
Switch libpwq submodule to upstream repository
Switch to mheily repository (all the needed changes from dgrove-oss have been merged upstream). Tweak libdispatch's configure.ac so that if we are building our own libpwq from source, the primary configure passes down an argument to libpwq's configure to modify libpwq's install targets so that libpthread_workqueue.la is built as a libtool convenience library and libpwg's man pages and header files are not installed when libdispatch is installed. Signed-off-by: Daniel A. Steffen <[email protected]>
1 parent 6a48519 commit df08133

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "libpwq"]
22
path = libpwq
3-
url = https://github.com/dgrove-oss/libpwq.git
3+
url = https://github.com/mheily/libpwq.git

configure.ac

+1
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ AC_CHECK_HEADERS([pthread_machdep.h pthread/qos.h])
185185
# Look for own version first, then system version.
186186
AS_IF([test -f $srcdir/libpwq/configure.ac],
187187
[AC_DEFINE(BUILD_OWN_PTHREAD_WORKQUEUES, 1, [Define if building pthread work queues from source])
188+
ac_configure_args="--disable-libpwq-install $ac_configure_args"
188189
AC_CONFIG_SUBDIRS([libpwq])
189190
build_own_pthread_workqueue=true,
190191
AC_DEFINE(HAVE_PTHREAD_WORKQUEUES, 1, [Define if pthread work queues are present])

0 commit comments

Comments
 (0)