You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by jo...@apache.org on 2016/01/04 18:46:18 UTC
[1/2] mesos git commit: Fixed the Mesos pkg-config for picojson.
Repository: mesos
Updated Branches:
refs/heads/master b51a87229 -> 1849bd606
Fixed the Mesos pkg-config for picojson.
The pkg-config file needs to explicitly set the -I path, and also
set and preprocessor definitions that Mesos assumes will be set for
picojson.h.
Review: https://reviews.apache.org/r/41425/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/1849bd60
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/1849bd60
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/1849bd60
Branch: refs/heads/master
Commit: 1849bd606658f2aa3b5f90c95fea7b084019fa1b
Parents: 142157d
Author: James Peach <jp...@apache.org>
Authored: Mon Jan 4 09:26:57 2016 -0800
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Mon Jan 4 09:46:09 2016 -0800
----------------------------------------------------------------------
mesos.pc.in | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/1849bd60/mesos.pc.in
----------------------------------------------------------------------
diff --git a/mesos.pc.in b/mesos.pc.in
index bc4f7e7..a0cc66a 100644
--- a/mesos.pc.in
+++ b/mesos.pc.in
@@ -11,3 +11,5 @@ prefix=@prefix@
exec_prefix=@exec_prefix@
includedir=@includedir@
libdir=@libdir@
+Cflags: -I${includedir} -DPICOJSON_USE_INT64 -D__STDC_FORMAT_MACROS
+Libs: -L${libdir} -lmesos
[2/2] mesos git commit: Install picojson.h if we are using the
bundled version.
Posted by jo...@apache.org.
Install picojson.h if we are using the bundled version.
The Stout JSON API depends on picojson.h, so we need to install it
to be able to build Mesos modules outside the Mesos source tree.
Review: https://reviews.apache.org/r/41424/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/142157dc
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/142157dc
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/142157dc
Branch: refs/heads/master
Commit: 142157dc787538a6ef59678c6ac6c337ff743ab2
Parents: b51a872
Author: James Peach <jp...@apache.org>
Authored: Mon Jan 4 09:26:47 2016 -0800
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Mon Jan 4 09:46:09 2016 -0800
----------------------------------------------------------------------
3rdparty/libprocess/3rdparty/Makefile.am | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/142157dc/3rdparty/libprocess/3rdparty/Makefile.am
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/Makefile.am b/3rdparty/libprocess/3rdparty/Makefile.am
index 04d0fa3..084475a 100644
--- a/3rdparty/libprocess/3rdparty/Makefile.am
+++ b/3rdparty/libprocess/3rdparty/Makefile.am
@@ -39,7 +39,6 @@ LIBEV = libev-$(LIBEV_VERSION)
PROTOBUF = protobuf-$(PROTOBUF_VERSION)
PICOJSON = picojson-$(PICOJSON_VERSION)
-
EXTRA_DIST = \
$(BOOST).tar.gz \
$(GLOG).tar.gz \
@@ -227,6 +226,11 @@ if WITH_BUNDLED_PICOJSON
# Enable the INT64 support for PicoJSON.
stout_tests_CPPFLAGS += -DPICOJSON_USE_INT64
stout_tests_CPPFLAGS += -D__STDC_FORMAT_MACROS
+
+ # Stout depends on <picojson.h>. Install picojson.h into $PREFIX/include
+ # but don't add it to the source tarball.
+ nodist_include_HEADERS = $(PICOJSON)/picojson.h
+ $(PICOJSON)/picojson.h: $(PICOJSON)-stamp
endif
if WITH_BUNDLED_GLOG