svn commit: r564580 - in head/math/form: . files

[Emanuel Haupt]

Author: ehaupt
Date: Sat Feb  6 22:01:19 2021
New Revision: 564580
URL: https://svnweb.freebsd.org/changeset/ports/564580

Log:
  Fix building with DOXYGEN enabled

Added:
  head/math/form/files/
  head/math/form/files/patch-configure.ac   (contents, props changed)
Modified:
  head/math/form/Makefile

Modified: head/math/form/Makefile
==============================================================================
--- head/math/form/Makefile	Sat Feb  6 21:56:39 2021	(r564579)
+++ head/math/form/Makefile	Sat Feb  6 22:01:19 2021	(r564580)
@@ -33,7 +33,6 @@ CONFIGURE_ARGS+=	--enable-scalar \
 MPICC?=			${LOCALBASE}/mpi/openmpi/bin/mpicc
 MPICXX?=		${LOCALBASE}/mpi/openmpi/bin/mpic++
 
-DOXYGEN_BROKEN=		fails to build
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 
 OPENMPI_CONFIGURE_ENABLE=	parform
@@ -42,9 +41,6 @@ OPENMPI_CONFIGURE_ENV+=	MPICC="${MPICC}" MPICXX="${MPI
 
 OPENMPI_LIB_DEPENDS=	libmpi.so:net/openmpi \
 			libgcc_s.so.1:lang/gcc9
-
-post-patch:
-	@${REINPLACE_CMD} -e 's| -O3||' ${WRKSRC}/configure.ac
 
 post-build-DOXYGEN-on:
 	(cd ${WRKSRC}/doc/manual; ${MAKE_CMD} html pdf)

Added: head/math/form/files/patch-configure.ac
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/form/files/patch-configure.ac	Sat Feb  6 22:01:19 2021	(r564580)
@@ -0,0 +1,22 @@
+--- configure.ac.orig	2018-11-21 06:20:16 UTC
++++ configure.ac
+@@ -22,8 +22,8 @@ m4_define([FORM_VERSION], m4_esyscmd_s([
+ 				echo "$major_version.$minor_version" >.version
+ 				echo "#define REPO_MAJOR_VERSION $major_version"  >sources/version.h.in
+ 				echo "#define REPO_MINOR_VERSION $minor_version" >>sources/version.h.in
+-				echo '\\def\\repomajorversion'"{$major_version}"  >doc/manual/version.tex.in
+-				echo '\\def\\repominorversion'"{$minor_version}" >>doc/manual/version.tex.in
++				echo "\\def\\repomajorversion{$major_version}"  >doc/manual/version.tex.in
++				echo "\\def\\repominorversion{$minor_version}" >>doc/manual/version.tex.in
+ 				cp doc/manual/version.tex.in doc/devref/version.tex.in
+ 			fi
+ 			cat <<END >&2
+@@ -742,7 +742,7 @@ my_test_COMPILEFLAGS=${COMPILEFLAGS+set}
+ if test "$my_test_COMPILEFLAGS" != set; then
+ 	if test "x$vendor" = xgnu; then
+ 		# We don't use -pedantic option because of horrible warnings.
+-		COMPILEFLAGS="-Wall -Wextra -Wpadded -O3"
++		COMPILEFLAGS="-Wall -Wextra -Wpadded"
+ 		if test "x$enable_profile" != xgprof; then
+ 			# -pg conflicts with -fomit-frame-pointer.
+ 			COMPILEFLAGS="$COMPILEFLAGS -fomit-frame-pointer"