Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 18 Sep 2019 09:29:54 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r512264 - head/security/barnyard2
Message-ID:  <201909180929.x8I9TsUO078672@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tobik
Date: Wed Sep 18 09:29:53 2019
New Revision: 512264
URL: https://svnweb.freebsd.org/changeset/ports/512264

Log:
  security/barnyard2: Spell ODBC_CONFIGURE_WITH correctly
  
  The option now actually activates the ODBC code paths but the port
  fails to build with it.  The code seems to lack full support for
  it in a couple of places, so mark the ODBC option as broken for
  now.
  
  spo_database.c:3547:3: error: use of undeclared identifier 'result'
  result = 0;
  ^
  spo_database.c:3841:41: warning: incompatible pointer types passing 'SQLINTEGER *' (aka 'int *') to parameter of type 'SQLLEN *' (aka 'long *') [-Wincompatible-pointer-types]
  if(SQLRowCount(data->u_statement, &data->u_rows) == SQL_SUCCESS)
  ^~~~~~~~~~~~~
  /usr/local/include/sql.h:768:44: note: passing argument to parameter 'RowCount' here
  SQLLEN *RowCount);
  ^
  spo_database.c:3849:33: error: use of undeclared identifier 'result'
  result = 0;
  ^
  1 warning and 2 errors generated.
  
  PR:		240237
  Approved by:	bofh (maintainer timeout, 17 days)

Modified:
  head/security/barnyard2/Makefile

Modified: head/security/barnyard2/Makefile
==============================================================================
--- head/security/barnyard2/Makefile	Wed Sep 18 09:26:07 2019	(r512263)
+++ head/security/barnyard2/Makefile	Wed Sep 18 09:29:53 2019	(r512264)
@@ -3,7 +3,7 @@
 PORTNAME=	barnyard2
 PORTVERSION=	1.13
 DISTVERSIONPREFIX=	v2-
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security
 
 MAINTAINER=	bofh@FreeBSD.org
@@ -56,8 +56,9 @@ MYSQL_CONFIGURE_WITH=	mysql
 MYSQL_CONFIGURE_ON=	--with-mysql-includes=${LOCALBASE}/include/mysql \
 			--with-mysql-libraries=${LOCALBASE}/lib/mysql
 MYSQL_SSL_CONFIGURE_ENABLE=	mysql-ssl-support
+ODBC_BROKEN=		fails to build with ODBC=on
 ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
-ODBC_WITH=		odbc
+ODBC_CONFIGURE_WITH=	odbc
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ON=	--with-postgresql=${LOCALBASE}/bin/pg_config --with-pgsql-includes=${LOCALBASE}/include/postgresql/server
 PGSQL_CONFIGURE_OFF=	--without-postgresql



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909180929.x8I9TsUO078672>