Skip to content

Commit

Permalink
Prevent VERSION from being picked up as C++20 <version> standard …
Browse files Browse the repository at this point in the history
…header.

- Move `config.h` (created by `configure`) from main directory to `unix` subdirectory
- Move original `VERSION` from `unix` to `unix/prebuild` subdirectory.
- Fix some instances in `prebuild.sh` where we're adding the main directory to the include search path for no obvious reason.

This should fix GitHub issue #403.
  • Loading branch information
c-lipka committed Jun 2, 2021
1 parent 48b1951 commit f68653c
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
5 changes: 5 additions & 0 deletions changes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,11 @@ Fixed or Mitigated Bugs
"Building on postmarketOS on PinePhone").
- Eliminate uint type from platform-independent code (concludes fix of
GitHub issue #400, "Building on postmarketOS on PinePhone").
- Change locations of auto-generated `config.h` and origonal `VERSION` file
to prevent the latter or its copy from erroneously being picked up on some
systems as `<version>` standard C++20 include file by libraries (notably
boost thread 1.73 and later; fixes GitHub issue #403, "povray 3.7.0.8 does
not build on macOS 11.0 Big Sur").


Changes between 3.7.0.7 and 3.7.0.8
Expand Down
2 changes: 1 addition & 1 deletion unix/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ VERSION_BASE=`echo $PACKAGE_VERSION | sed 's,\([[0-9]]*.[[0-9]]*\).*,\1,g'`
AC_SUBST([VERSION_BASE])
AC_DEFINE_UNQUOTED([VERSION_BASE], ["$VERSION_BASE"], [Base version number of package.])
AC_CONFIG_AUX_DIR([unix/config])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_HEADERS([unix/config.h])
AC_CONFIG_SRCDIR([unix/disp_text.cpp])

# Additional autoconf macros.
Expand Down
6 changes: 2 additions & 4 deletions unix/prebuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

umask 022

pov_version_base=`cat ./VERSION | sed 's,\([0-9]*.[0-9]*\).*,\1,g'`
pov_version_base=`cat ./prebuild/VERSION | sed 's,\([0-9]*.[0-9]*\).*,\1,g'`
pov_config_bugreport="POV-Ray Bugtracker http://bugs.povray.org/"

# documentation
Expand Down Expand Up @@ -350,7 +350,7 @@ echo "make maintainer-clean" 1>&2 && make maintainer-clean 1>&2 ; \
# some shells seem unable to expand properly wildcards in the list entries
# (e.g. ../distribution/in*/).
for file in \
AUTHORS ChangeLog configure.ac COPYING NEWS README VERSION \
AUTHORS ChangeLog configure.ac COPYING NEWS README prebuild/VERSION \
povray.1 povray.conf \
scripts \
../distribution/ini ../distribution/include ../distribution/scenes
Expand Down Expand Up @@ -425,7 +425,6 @@ povray_SOURCES = \\
# Include paths for headers.
AM_CPPFLAGS = \\
-I\$(top_srcdir) \\
-I\$(top_srcdir)/source \\
-I\$(top_builddir)/source \\
-I\$(top_srcdir)/source/backend \\
Expand Down Expand Up @@ -789,7 +788,6 @@ libpovray_a_SOURCES = \\
# Include paths for headers.
AM_CPPFLAGS = \\
-I\$(top_srcdir) \\
-I\$(top_srcdir)/source/backend \\
-I\$(top_srcdir)/source/base \\
-I\$(top_srcdir)/source/frontend \\
Expand Down
File renamed without changes.

0 comments on commit f68653c

Please sign in to comment.