svn commit: r349205 - in head/databases: apq apq-mysql apq-odbc apq-pgsql

[John Marino]

Author: marino
Date: Wed Mar 26 01:39:57 2014
New Revision: 349205
URL: http://svnweb.freebsd.org/changeset/ports/349205
QAT: https://qat.redports.org/buildarchive/r349205/

Log:
  APQ ports: apq, apq-mysql, apq-pgsql, apq-odbc
  
  Without direction, GPRconfig will create a cgpr file at the standard
  $PREFIX/lib/gnat repository.  This is the cause of the builder
  failures because it touches a part of the userland it's not supposed to.
  
  GPRconfig should be modified not to do this; it is never desirable.
  In the meantime, the fix for APQ is to specify .cgpr targets which do
  not exist so GPRconfig creates them there instead of $PREFIX/lib/gnat.
  
  Reported by: swills

Modified:
  head/databases/apq-mysql/Makefile
  head/databases/apq-odbc/Makefile
  head/databases/apq-pgsql/Makefile
  head/databases/apq/Makefile

Modified: head/databases/apq-mysql/Makefile
==============================================================================
--- head/databases/apq-mysql/Makefile	Wed Mar 26 01:37:43 2014	(r349204)
+++ head/databases/apq-mysql/Makefile	Wed Mar 26 01:39:57 2014	(r349205)
@@ -32,6 +32,10 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \
 post-patch:
 	@${REINPLACE_CMD} -e '/for Object_Dir/d' \
 		${WRKSRC}/src-in/apq-mysql.gpr.in
+	${REINPLACE_CMD} -e 's|processors=2|gprbuild_params="--autoconf=apq.cgpr"|' \
+		${WRKSRC}/configure
+	${REINPLACE_CMD} -e 's|-ws|-ws --autoconf=dummy.cgpr|' \
+		${WRKSRC}/scripts/buildutil.sh
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/gnat \

Modified: head/databases/apq-odbc/Makefile
==============================================================================
--- head/databases/apq-odbc/Makefile	Wed Mar 26 01:37:43 2014	(r349204)
+++ head/databases/apq-odbc/Makefile	Wed Mar 26 01:39:57 2014	(r349205)
@@ -37,6 +37,10 @@ post-patch:
 	${RM} ${WRKSRC}/src/*.orig
 	${REINPLACE_CMD} -e 's|"-march=x86-64",||g' -e '/for Object_Dir/d' \
 		${WRKSRC}/gnat/apq-odbc.gpr.in
+	${REINPLACE_CMD} -e 's|processors=2|gprbuild_params="--autoconf=apq.cgpr"|' \
+		${WRKSRC}/configure
+	${REINPLACE_CMD} -e 's|-ws|-ws --autoconf=dummy.cgpr|' \
+		${WRKSRC}/scripts/buildutil.sh
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/gnat \

Modified: head/databases/apq-pgsql/Makefile
==============================================================================
--- head/databases/apq-pgsql/Makefile	Wed Mar 26 01:37:43 2014	(r349204)
+++ head/databases/apq-pgsql/Makefile	Wed Mar 26 01:39:57 2014	(r349205)
@@ -33,6 +33,10 @@ post-patch:
 	${RM} ${WRKSRC}/src/*.orig
 	@${REINPLACE_CMD} -e '/for Object_Dir/d' \
 		${WRKSRC}/src-in/apq-postgresql.gpr.in
+	${REINPLACE_CMD} -e 's|processors=2|gprbuild_params="--autoconf=apq.cgpr"|' \
+		${WRKSRC}/configure
+	${REINPLACE_CMD} -e 's|-ws|-ws --autoconf=dummy.cgpr|' \
+		${WRKSRC}/scripts/buildutil.sh
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/gnat \

Modified: head/databases/apq/Makefile
==============================================================================
--- head/databases/apq/Makefile	Wed Mar 26 01:37:43 2014	(r349204)
+++ head/databases/apq/Makefile	Wed Mar 26 01:39:57 2014	(r349205)
@@ -32,6 +32,10 @@ OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e '/for Object_Dir/d' ${WRKSRC}/gnat/apq.gpr.in
+	${REINPLACE_CMD} -e 's|processors=2|gprbuild_params="--autoconf=apq.cgpr"|' \
+		${WRKSRC}/configure
+	${REINPLACE_CMD} -e 's|-ws|-ws --autoconf=dummy.cgpr|' \
+		${WRKSRC}/scripts/buildutil.sh
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/gnat \