From owner-svn-ports-all@freebsd.org Fri Jan 5 11:06:17 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 10FE9EC4241; Fri, 5 Jan 2018 11:06:17 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CCD5F35AE; Fri, 5 Jan 2018 11:06:16 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w05B6FXl031117; Fri, 5 Jan 2018 11:06:15 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w05B6FO4031115; Fri, 5 Jan 2018 11:06:15 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <201801051106.w05B6FO4031115@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Fri, 5 Jan 2018 11:06:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r458126 - in head/databases/soci: . files X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: in head/databases/soci: . files X-SVN-Commit-Revision: 458126 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jan 2018 11:06:17 -0000 Author: adridg Date: Fri Jan 5 11:06:15 2018 New Revision: 458126 URL: https://svnweb.freebsd.org/changeset/ports/458126 Log: 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 Added: head/databases/soci/files/patch-backends_mysql_session.cpp (contents, props changed) Modified: head/databases/soci/Makefile Modified: head/databases/soci/Makefile ============================================================================== --- head/databases/soci/Makefile Fri Jan 5 10:55:47 2018 (r458125) +++ head/databases/soci/Makefile Fri Jan 5 11:06:15 2018 (r458126) @@ -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 @@ COMMENT= C++ Database Access Library 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 Added: head/databases/soci/files/patch-backends_mysql_session.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/soci/files/patch-backends_mysql_session.cpp Fri Jan 5 11:06:15 2018 (r458126) @@ -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); + }