diff options
| author | Emanuel Haupt <ehaupt@FreeBSD.org> | 2021-02-06 22:01:19 +0000 |
|---|---|---|
| committer | Emanuel Haupt <ehaupt@FreeBSD.org> | 2021-02-06 22:01:19 +0000 |
| commit | 5e11d86000a0b9fa5a57c1a21ae7c3a77637e47d (patch) | |
| tree | 539de801373e799a21695ec1a2c65e8586f3d5a0 /math | |
| parent | multimedia/plexmediaserver-plexpass: Update to 1.21.3.4015 (diff) | |
Fix building with DOXYGEN enabled
Notes
Notes:
svn path=/head/; revision=564580
Diffstat (limited to 'math')
| -rw-r--r-- | math/form/Makefile | 4 | ||||
| -rw-r--r-- | math/form/files/patch-configure.ac | 22 |
2 files changed, 22 insertions, 4 deletions
diff --git a/math/form/Makefile b/math/form/Makefile index 0c59828b6ad1..f9d7493e28f9 100644 --- a/math/form/Makefile +++ b/math/form/Makefile @@ -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 @@ -43,9 +42,6 @@ OPENMPI_CONFIGURE_ENV+= MPICC="${MPICC}" MPICXX="${MPICXX}" 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) diff --git a/math/form/files/patch-configure.ac b/math/form/files/patch-configure.ac new file mode 100644 index 000000000000..166b7b9ef8c8 --- /dev/null +++ b/math/form/files/patch-configure.ac @@ -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" |