mirror of
https://git.freebsd.org/ports.git
synced 2025-05-25 15:36:35 -04:00
Fix build of databases/soci w/ clang 4.0 and later and on arm6, arm7.
Adds upstream patch to fix backends/mysql/session.cpp:202:22: error: ordered comparison between pointer and zero ('int *' and 'int') if (port < 0) PR: 222651 216074 Reported by: jbeich, Neel Chauhan Reviewed by: jlaffaye Approved by: tcberner (mentor) Obtained from: upstream Differential Revision: https://reviews.freebsd.org/D13769
This commit is contained in:
parent
511f6cbe19
commit
5ec4027e7a
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=458126
2 changed files with 15 additions and 4 deletions
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
PORTNAME= soci
|
PORTNAME= soci
|
||||||
PORTVERSION= 3.2.2
|
PORTVERSION= 3.2.2
|
||||||
PORTREVISION= 7
|
PORTREVISION= 8
|
||||||
CATEGORIES= databases
|
CATEGORIES= databases
|
||||||
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
|
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
|
||||||
|
|
||||||
|
@ -13,9 +13,6 @@ COMMENT= C++ Database Access Library
|
||||||
LICENSE= BSL
|
LICENSE= BSL
|
||||||
LICENSE_FILE= ${WRKSRC}/LICENSE_1_0.txt
|
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
|
USES= cmake zip
|
||||||
CMAKE_ARGS+= -DWITH_ORACLE:BOOL=OFF
|
CMAKE_ARGS+= -DWITH_ORACLE:BOOL=OFF
|
||||||
USE_LDCONFIG= yes
|
USE_LDCONFIG= yes
|
||||||
|
|
14
databases/soci/files/patch-backends_mysql_session.cpp
Normal file
14
databases/soci/files/patch-backends_mysql_session.cpp
Normal file
|
@ -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);
|
||||||
|
}
|
Loading…
Add table
Reference in a new issue