Skip to content

Commit f68653c

Browse files
committed
Prevent VERSION from being picked up as C++20 <version> standard 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.
1 parent 48b1951 commit f68653c

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

changes.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,11 @@ Fixed or Mitigated Bugs
4646
"Building on postmarketOS on PinePhone").
4747
- Eliminate uint type from platform-independent code (concludes fix of
4848
GitHub issue #400, "Building on postmarketOS on PinePhone").
49+
- Change locations of auto-generated `config.h` and origonal `VERSION` file
50+
to prevent the latter or its copy from erroneously being picked up on some
51+
systems as `<version>` standard C++20 include file by libraries (notably
52+
boost thread 1.73 and later; fixes GitHub issue #403, "povray 3.7.0.8 does
53+
not build on macOS 11.0 Big Sur").
4954

5055

5156
Changes between 3.7.0.7 and 3.7.0.8

unix/configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ VERSION_BASE=`echo $PACKAGE_VERSION | sed 's,\([[0-9]]*.[[0-9]]*\).*,\1,g'`
5050
AC_SUBST([VERSION_BASE])
5151
AC_DEFINE_UNQUOTED([VERSION_BASE], ["$VERSION_BASE"], [Base version number of package.])
5252
AC_CONFIG_AUX_DIR([unix/config])
53-
AC_CONFIG_HEADERS([config.h])
53+
AC_CONFIG_HEADERS([unix/config.h])
5454
AC_CONFIG_SRCDIR([unix/disp_text.cpp])
5555

5656
# Additional autoconf macros.

unix/prebuild.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444

4545
umask 022
4646

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

5050
# documentation
@@ -350,7 +350,7 @@ echo "make maintainer-clean" 1>&2 && make maintainer-clean 1>&2 ; \
350350
# some shells seem unable to expand properly wildcards in the list entries
351351
# (e.g. ../distribution/in*/).
352352
for file in \
353-
AUTHORS ChangeLog configure.ac COPYING NEWS README VERSION \
353+
AUTHORS ChangeLog configure.ac COPYING NEWS README prebuild/VERSION \
354354
povray.1 povray.conf \
355355
scripts \
356356
../distribution/ini ../distribution/include ../distribution/scenes
@@ -425,7 +425,6 @@ povray_SOURCES = \\
425425
426426
# Include paths for headers.
427427
AM_CPPFLAGS = \\
428-
-I\$(top_srcdir) \\
429428
-I\$(top_srcdir)/source \\
430429
-I\$(top_builddir)/source \\
431430
-I\$(top_srcdir)/source/backend \\
@@ -789,7 +788,6 @@ libpovray_a_SOURCES = \\
789788
790789
# Include paths for headers.
791790
AM_CPPFLAGS = \\
792-
-I\$(top_srcdir) \\
793791
-I\$(top_srcdir)/source/backend \\
794792
-I\$(top_srcdir)/source/base \\
795793
-I\$(top_srcdir)/source/frontend \\
File renamed without changes.

0 commit comments

Comments
 (0)