Attachment #215952 for bug #246854




PLIST_SUB=	DISTVERSION=${DISTVERSION}

CMAKE_BUILD_TYPE=	MinSizeRel
CMAKE_ARGS=		-DVERSION=${DISTVERSION}
CMAKE_ON=		BUILD_SERVER BUILD_TEST
INSTALL_TARGET=		install/strip
TEST_TARGET=		test

OPTIONS_DEFINE=		DEVEL STATIC TLS
OPTIONS_DEFAULT=	TLS
OPTIONS_SUB=		yes

TLS_DESC=		Enable TLS support ( requiring OpenSSL )
TLS_CMAKE_BOOL=		ENABLE_TLS

STATIC_DESC=		Static linking
STATIC_CMAKE_BOOL=	STATIC_LINK




--- include/pichi/config.hpp.in.orig	1970-01-01 00:00:00 UTC
+++ include/pichi/config.hpp.in
@@ -42,6 +42,15 @@
 #pragma warning(pop)
 #endif // DISABLE_C4702_FOR_BEAST_FIELDS && _MSC_VER
 
+#ifdef __clang__
+#if !__has_feature(c_atomic)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wc11-extensions"
+#include <boost/smart_ptr/detail/sp_counted_base_clang.hpp>
+#pragma clang diagnostic pop
+#endif // !__has_feature(c_atomic)
+#endif // __clang__
+
 #cmakedefine CMAKE_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@"
 
 #ifdef CMAKE_INSTALL_PREFIX




--- server/main.cpp.orig	1970-01-01 00:00:00 UTC
+++ server/main.cpp
@@ -1,10 +1,11 @@
+#include <pichi/config.hpp>
+// Include config.hpp first
 #include <boost/filesystem/operations.hpp>
 #include <boost/filesystem/path.hpp>
 #include <boost/program_options.hpp>
 #include <fstream>
 #include <iostream>
 #include <memory>
-#include <pichi/config.hpp>
 #include <stdio.h>
 #ifdef HAS_UNISTD_H
 #include <errno.h>




--- test/endpoint.cpp.orig	1970-01-01 00:00:00 UTC
+++ test/endpoint.cpp
@@ -132,7 +132,8 @@ BOOST_AUTO_TEST_CASE(serialize_Domain)
 #ifndef HAS_CLASS_TEMPLATE_ARGUMENT_DEDUCTION
       <uint8_t, 13>
 #endif // HAS_CLASS_TEMPLATE_ARGUMENT_DEDUCTION
-      {0x03, 0x09, 'l', 'o', 'c', 'a', 'l', 'h', 'o', 's', 't', 0x01, 0xbb};
+      {0x03_u8, 0x09_u8, 0x6c_u8, 0x6f_u8, 0x63_u8, 0x61_u8, 0x6c_u8,
+       0x68_u8, 0x6f_u8, 0x73_u8, 0x74_u8, 0x01_u8, 0xbb_u8};
 
   auto fact = array<uint8_t, 13>{};
   auto len = serializeEndpoint(makeEndpoint(host, port), fact);

Line 0 Link Here

(-)pichi/files/patch-test_method.cpp (+9 lines)
	1	--- test/method.cpp.orig 1970-01-01 00:00:00 UTC
	2	+++ test/method.cpp
	3	@@ -1,5 +1,6 @@
	4	#define BOOST_TEST_MODULE pichi method test
	5
	6	+#include "utils.hpp"
	7	#include <boost/test/unit_test.hpp>
	8	#include <pichi/common.hpp>
	9	#include <pichi/crypto/method.hpp>

Line 0 Link Here

(-)pichi/files/patch-test_utils.hpp (+11 lines)
	1	--- test/utils.hpp.orig 1970-01-01 00:00:00 UTC
	2	+++ test/utils.hpp
	3	@@ -1,6 +1,8 @@
	4	#ifndef PICHI_TEST_UTILS_HPP
	5	#define PICHI_TEST_UTILS_HPP
	6
	7	+#include <pichi/config.hpp>
	8	+// Include config.hpp first
	9	#include <boost/asio/error.hpp>
	10	#include <boost/beast/http/error.hpp>
	11	#include <pichi/api/vos.hpp>

Return to bug 246854

Lines 21-37 Link Here

(-)pichi/Makefile (-6 / +6 lines)
21	PLIST_SUB= DISTVERSION=${DISTVERSION}	21	PLIST_SUB= DISTVERSION=${DISTVERSION}
22		22
23	CMAKE_BUILD_TYPE= MinSizeRel	23	CMAKE_BUILD_TYPE= MinSizeRel
24	CMAKE_ARGS= -DVERSION=${DISTVERSION}	24	CMAKE_ARGS= -DVERSION=${DISTVERSION}
25	CMAKE_ON= BUILD_SERVER BUILD_TEST	25	CMAKE_ON= BUILD_SERVER BUILD_TEST
26	INSTALL_TARGET= install/strip	26	INSTALL_TARGET= install/strip
27	TEST_TARGET= test	27	TEST_TARGET= test
28		28
29	OPTIONS_DEFINE= DEVEL STATIC TLS	29	OPTIONS_DEFINE= DEVEL STATIC TLS
30	OPTIONS_DEFAULT= TLS	30	OPTIONS_DEFAULT= TLS
31	OPTIONS_SUB= yes	31	OPTIONS_SUB= yes
32		32
33	TLS_DESC= Enable TLS support ( requiring OpenSSL )	33	TLS_DESC= Enable TLS support ( requiring OpenSSL )
34	TLS_CMAKE_BOOL= ENABLE_TLS	34	TLS_CMAKE_BOOL= ENABLE_TLS
35		35
36	STATIC_DESC= Static linking	36	STATIC_DESC= Static linking
37	STATIC_CMAKE_BOOL= STATIC_LINK	37	STATIC_CMAKE_BOOL= STATIC_LINK

Line 0 Link Here

(-)pichi/files/patch-include_pichi_config.hpp.in (+18 lines)
	1	--- include/pichi/config.hpp.in.orig 1970-01-01 00:00:00 UTC
	2	+++ include/pichi/config.hpp.in
	3	@@ -42,6 +42,15 @@
	4	#pragma warning(pop)
	5	#endif // DISABLE_C4702_FOR_BEAST_FIELDS && _MSC_VER
	6
	7	+#ifdef __clang__
	8	+#if !__has_feature(c_atomic)
	9	+#pragma clang diagnostic push
	10	+#pragma clang diagnostic ignored "-Wc11-extensions"
	11	+#include <boost/smart_ptr/detail/sp_counted_base_clang.hpp>
	12	+#pragma clang diagnostic pop
	13	+#endif // !__has_feature(c_atomic)
	14	+#endif // __clang__
	15	+
	16	#cmakedefine CMAKE_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@"
	17
	18	#ifdef CMAKE_INSTALL_PREFIX

Line 0 Link Here

(-)pichi/files/patch-server_main.cpp (+15 lines)
	1	--- server/main.cpp.orig 1970-01-01 00:00:00 UTC
	2	+++ server/main.cpp
	3	@@ -1,10 +1,11 @@
	4	+#include <pichi/config.hpp>
	5	+// Include config.hpp first
	6	#include <boost/filesystem/operations.hpp>
	7	#include <boost/filesystem/path.hpp>
	8	#include <boost/program_options.hpp>
	9	#include <fstream>
	10	#include <iostream>
	11	#include <memory>
	12	-#include <pichi/config.hpp>
	13	#include <stdio.h>
	14	#ifdef HAS_UNISTD_H
	15	#include <errno.h>

Line 0 Link Here

(-)pichi/files/patch-test_endpoint.cpp (+12 lines)
	1	--- test/endpoint.cpp.orig 1970-01-01 00:00:00 UTC
	2	+++ test/endpoint.cpp
	3	@@ -132,7 +132,8 @@ BOOST_AUTO_TEST_CASE(serialize_Domain)
	4	#ifndef HAS_CLASS_TEMPLATE_ARGUMENT_DEDUCTION
	5	<uint8_t, 13>
	6	#endif // HAS_CLASS_TEMPLATE_ARGUMENT_DEDUCTION
	7	- {0x03, 0x09, 'l', 'o', 'c', 'a', 'l', 'h', 'o', 's', 't', 0x01, 0xbb};
	8	+ {0x03_u8, 0x09_u8, 0x6c_u8, 0x6f_u8, 0x63_u8, 0x61_u8, 0x6c_u8,
	9	+ 0x68_u8, 0x6f_u8, 0x73_u8, 0x74_u8, 0x01_u8, 0xbb_u8};
	10
	11	auto fact = array<uint8_t, 13>{};
	12	auto len = serializeEndpoint(makeEndpoint(host, port), fact);