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.
81 lines
3.0 KiB
81 lines
3.0 KiB
Index: 3rdparty/libprocess/Makefile.in |
|
--- 3rdparty/libprocess/Makefile.in.orig 2019-01-29 08:15:29.081738000 +0100 |
|
+++ 3rdparty/libprocess/Makefile.in 2019-01-29 08:16:40.267094000 +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: configure |
|
--- configure.orig 2019-01-16 03:15:03.000000000 +0100 |
|
+++ configure 2019-01-29 08:15:29.084567000 +0100 |
|
@@ -20683,9 +20683,6 @@ |
|
# _WITH_GETLINE for getline(). |
|
CXXFLAGS="$CXXFLAGS -DGTEST_HAS_PTHREAD -D_WITH_GETLINE" |
|
|
|
- # Add no-sentinal so that stout builds with system clang on 11.0 and later |
|
- # (3.8+). |
|
- CXXFLAGS="$CXXFLAGS -Wno-sentinel" |
|
;; |
|
esac |
|
|
|
Index: src/Makefile.in |
|
--- src/Makefile.in.orig 2019-01-16 03:15:07.000000000 +0100 |
|
+++ src/Makefile.in 2019-01-29 08:15:29.086974000 +0100 |
|
@@ -2392,7 +2392,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) |
|
|
|
@@ -3370,7 +3370,7 @@ |
|
libmesos_la_LIBADD = libmesos_no_3rdparty.la $(LIB_GLOG) $(LIB_GRPC) \ |
|
$(LIB_LEVELDB) $(LIB_LIBARCHIVE) $(LIB_PROCESS) \ |
|
$(LIB_PROTOBUF) $(LIB_ZOOKEEPER) -lsvn_subr-1 -lsvn_delta-1 \ |
|
- -lapr-1 $(am__append_43) |
|
+ -lapr $(am__append_43) |
|
mesos_agent_SOURCES = slave/main.cpp |
|
mesos_agent_CPPFLAGS = $(MESOS_CPPFLAGS) |
|
mesos_agent_LDADD = libmesos.la $(LDADD) $(am__append_36) |
|
Index: src/common/values.cpp |
|
--- src/common/values.cpp.orig 2019-01-16 03:14:52.000000000 +0100 |
|
+++ src/common/values.cpp 2019-01-29 08:15:29.087213000 +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 2019-01-16 03:14:52.000000000 +0100 |
|
+++ src/slave/containerizer/mesos/provisioner/provisioner.cpp 2019-01-29 08:15:29.087400000 +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 2019-01-16 03:14:52.000000000 +0100 |
|
+++ src/v1/values.cpp 2019-01-29 08:15:29.087562000 +0100 |
|
@@ -53,7 +53,7 @@ |
|
|
|
static long long convertToFixed(double floatValue) |
|
{ |
|
- return std::llround(floatValue * 1000); |
|
+ return llround(floatValue * 1000); |
|
} |
|
|
|
|
|
|