You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
68 lines
2.6 KiB
68 lines
2.6 KiB
Index: 3rdparty/libprocess/Makefile.in |
|
--- 3rdparty/libprocess/Makefile.in.orig 2018-02-02 02:12:28.000000000 +0100 |
|
+++ 3rdparty/libprocess/Makefile.in 2018-02-09 15:49:41.252321000 +0100 |
|
@@ -130,7 +130,7 @@ |
|
# Protect many of the functions with stack guards |
|
# (either -fstack-protector-strong or -fstack-protector depending on compiler support). |
|
# Produce position independent code when appropriate. |
|
-@ENABLE_HARDENING_TRUE@am__append_1 = @STACK_PROTECTOR@ -fPIC -fPIE |
|
+@ENABLE_HARDENING_TRUE@am__append_1 = -fPIC |
|
@WITH_BUNDLED_BOOST_TRUE@am__append_2 = $(BOOST)-stamp |
|
@WITH_BUNDLED_CONCURRENTQUEUE_TRUE@am__append_3 = $(CONCURRENTQUEUE)-stamp |
|
@WITH_BUNDLED_ELFIO_TRUE@am__append_4 = $(ELFIO)-stamp |
|
Index: src/Makefile.in |
|
--- src/Makefile.in.orig 2018-02-02 02:12:31.000000000 +0100 |
|
+++ src/Makefile.in 2018-02-09 12:45:22.173317000 +0100 |
|
@@ -2421,7 +2421,7 @@ |
|
# Enable common (and some language specific) warnings. |
|
# Warn when a comparison is made between signed and unsigned values. |
|
# Warn about use of format functions that can produce security issues. |
|
-AM_CXXFLAGS = $(PTHREAD_CFLAGS) -Wall -Wsign-compare -Wformat-security \ |
|
+AM_CXXFLAGS = $(PTHREAD_CFLAGS) \ |
|
$(am__append_4) |
|
AM_LIBS = $(PTHREAD_LIBS) |
|
|
|
@@ -3381,7 +3381,7 @@ |
|
# Add the convenience library. |
|
libmesos_la_LIBADD = libmesos_no_3rdparty.la $(LIB_GLOG) $(LIB_GRPC) \ |
|
$(LIB_LEVELDB) $(LIB_PROCESS) $(LIB_PROTOBUF) $(LIB_ZOOKEEPER) \ |
|
- -lsvn_subr-1 -lsvn_delta-1 -lapr-1 $(am__append_44) |
|
+ -lsvn_subr-1 -lsvn_delta-1 -lapr $(am__append_44) |
|
mesos_agent_SOURCES = slave/main.cpp |
|
mesos_agent_CPPFLAGS = $(MESOS_CPPFLAGS) |
|
mesos_agent_LDADD = libmesos.la $(LDADD) |
|
Index: src/common/values.cpp |
|
--- src/common/values.cpp.orig 2018-02-02 02:12:17.000000000 +0100 |
|
+++ src/common/values.cpp 2018-02-09 12:45:22.173521000 +0100 |
|
@@ -54,7 +54,7 @@ |
|
|
|
static long long convertToFixed(double floatValue) |
|
{ |
|
- return std::llround(floatValue * 1000); |
|
+ return llround(floatValue * 1000); |
|
} |
|
|
|
|
|
Index: src/slave/containerizer/mesos/provisioner/provisioner.cpp |
|
--- src/slave/containerizer/mesos/provisioner/provisioner.cpp.orig 2018-02-02 02:12:17.000000000 +0100 |
|
+++ src/slave/containerizer/mesos/provisioner/provisioner.cpp 2018-02-09 12:45:22.173733000 +0100 |
|
@@ -15,6 +15,7 @@ |
|
// limitations under the License. |
|
|
|
#ifndef __WINDOWS__ |
|
+#include <sys/types.h> |
|
#include <fts.h> |
|
#endif // __WINDOWS__ |
|
|
|
Index: src/v1/values.cpp |
|
--- src/v1/values.cpp.orig 2018-02-02 02:12:17.000000000 +0100 |
|
+++ src/v1/values.cpp 2018-02-09 12:45:22.173913000 +0100 |
|
@@ -53,7 +53,7 @@ |
|
|
|
static long long convertToFixed(double floatValue) |
|
{ |
|
- return std::llround(floatValue * 1000); |
|
+ return llround(floatValue * 1000); |
|
} |
|
|
|
|
|
|