D13769.id54425.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D13769.id54425.diff
View Options

	Index: head/databases/soci/Makefile
	===================================================================
	--- head/databases/soci/Makefile
	+++ head/databases/soci/Makefile
	@@ -3,7 +3,7 @@

	PORTNAME= soci
	PORTVERSION= 3.2.2
	-PORTREVISION= 7
	+PORTREVISION= 8
	CATEGORIES= databases
	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}

	@@ -12,9 +12,6 @@

	LICENSE= BSL
	LICENSE_FILE= ${WRKSRC}/LICENSE_1_0.txt
	-
	-BROKEN_armv6= fails to compile: backends/mysql/session.cpp:202:22: error: ordered comparison between pointer and zero ('int *' and 'int')
	-BROKEN_armv7= fails to compile: backends/mysql/session.cpp:202:22: error: ordered comparison between pointer and zero ('int *' and 'int')

	USES= cmake zip
	CMAKE_ARGS+= -DWITH_ORACLE:BOOL=OFF
	Index: head/databases/soci/files/patch-backends_mysql_session.cpp
	===================================================================
	--- head/databases/soci/files/patch-backends_mysql_session.cpp
	+++ head/databases/soci/files/patch-backends_mysql_session.cpp
	@@ -0,0 +1,14 @@
	+Patch obtained from upstream
	+https://github.com/SOCI/soci/commit/165737c4be7d6c9acde92610b92e8f42a4cfe933
	+
	+--- backends/mysql/session.cpp.orig 2018-01-04 20:29:49 UTC
	++++ backends/mysql/session.cpp
	+@@ -199,7 +199,7 @@ void parse_connect_string(const string &
	+ throw soci_error(err);
	+ }
	+ *port = std::atoi(val.c_str());
	+- if (port < 0)
	++ if (*port < 0)
	+ {
	+ throw soci_error(err);
	+ }