llvm8: rename "version" file so it isn't picked up by C++ #include <version>

This commit is contained in:
naddy 2019-06-12 21:54:40 +00:00
parent 559e0c2dd0
commit 5c2589d094
2 changed files with 15 additions and 4 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.15 2017/12/26 19:19:15 rsadowski Exp $
# $OpenBSD: Makefile,v 1.16 2019/06/12 21:54:40 naddy Exp $
COMMENT = library set for simulations, games and visualizations
@ -15,7 +15,7 @@ MAINTAINER = Pascal Stumpf <pascal@stumpf.co>
HOMEPAGE = http://www.flightgear.org
# LGPLv2
PERMIT_PACKAGE_CDROM = Yes
PERMIT_PACKAGE = Yes
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=flightgear/}
EXTRACT_SUFX = .tar.bz2
@ -36,4 +36,8 @@ CXXFLAGS += -I${X11BASE}/include -pthread
NO_TEST = Yes
# Keep C++ #include <version> from picking up this unrelated file
post-extract:
mv ${WRKSRC}/version ${WRKSRC}/version.txt
.include <bsd.port.mk>

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-CMakeLists_txt,v 1.3 2018/05/19 03:07:57 kirby Exp $
$OpenBSD: patch-CMakeLists_txt,v 1.4 2019/06/12 21:54:40 naddy Exp $
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -29,7 +29,7 @@ if(CMAKE_VERSION VERSION_LESS "3.1")
@@ -29,13 +29,13 @@ if(CMAKE_VERSION VERSION_LESS "3.1")
set (CMAKE_CXX_FLAGS "-std=gnu++98 ${CMAKE_CXX_FLAGS}")
endif()
else()
@ -12,3 +12,10 @@ Index: CMakeLists.txt
endif()
project(SimGear)
# read 'version' file into a variable (stripping any newlines or spaces)
-file(READ version versionFile)
+file(READ version.txt versionFile)
string(STRIP ${versionFile} SIMGEAR_VERSION)
# add a dependency on the versino file