Skip to content

Commit 687a958

Browse files
dg0ytdg0yt
committed
Merge branch 'dg0yt' into latest
2 parents 288748f + 0964752 commit 687a958

File tree

2 files changed

+124
-60
lines changed

2 files changed

+124
-60
lines changed

‎bison-3.7.2.cmake‎

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
# This file is part of OpenOrienteering.
2+
3+
# Copyright 2020 Kai Pastor
4+
#
5+
# Redistribution and use is allowed according to the terms of the BSD license:
6+
#
7+
# Redistribution and use in source and binary forms, with or without
8+
# modification, are permitted provided that the following conditions
9+
# are met:
10+
#
11+
# 1. Redistributions of source code must retain the copyright
12+
# notice, this list of conditions and the following disclaimer.
13+
# 2. Redistributions in binary form must reproduce the copyright
14+
# notice, this list of conditions and the following disclaimer in the
15+
# documentation and/or other materials provided with the distribution.
16+
# 3. The name of the author may not be used to endorse or promote products
17+
# derived from this software without specific prior written permission.
18+
#
19+
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
20+
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
21+
# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
22+
# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
23+
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
24+
# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25+
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26+
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27+
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
28+
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29+
30+
set(version 3.7.2+dfsg)
31+
set(download_hash SHA256=7d9dfcb129e4004915d1099c034184027b21e95ef18bda8adb65457ada217c45)
32+
set(patch_version ${version}-1)
33+
set(patch_hash SHA256=fd0514a4effe94864aa3a51bbb47ed36bc597cbebac83b27722632c0bbb0dc2a)
34+
set(base_url https://snapshot.debian.org/archive/debian/20200907T204912Z/pool/main/b/bison/)
35+
36+
option(USE_SYSTEM_BISON "Use the system Bison if possible" ON)
37+
38+
set(test_system_bison [[
39+
if(${USE_SYSTEM_BISON})
40+
enable_language(C)
41+
find_package(BISON 2.7.0 QUIET)
42+
string(FIND "${BISON_EXECUTABLE}" "${CMAKE_STAGING_PREFIX}/" staging_prefix_start)
43+
if(BISON_EXECUTABLE AND NOT staging_prefix_start EQUAL 0)
44+
message(STATUS "Found ${SYSTEM_NAME} Bison: ${BISON_EXECUTABLE}")
45+
set(BUILD_CONDITION 0)
46+
endif()
47+
endif()
48+
]])
49+
50+
set(bison_texi [[
51+
@setfilename bison.info
52+
]])
53+
54+
superbuild_package(
55+
NAME bison-patches
56+
VERSION ${patch_version}
57+
58+
SOURCE
59+
URL ${base_url}bison_${patch_version}.debian.tar.xz
60+
URL_HASH ${patch_hash}
61+
)
62+
63+
superbuild_package(
64+
NAME bison
65+
VERSION ${patch_version}
66+
DEPENDS
67+
source:bison-patches-${patch_version}
68+
69+
SOURCE_WRITE
70+
bison.texi bison_texi
71+
SOURCE
72+
URL ${base_url}bison_${version}.orig.tar.xz
73+
URL_HASH ${download_hash}
74+
PATCH_COMMAND
75+
"${CMAKE_COMMAND}"
76+
-Dpackage=bison-patches-${patch_version}
77+
-P "${APPLY_PATCHES_SERIES}"
78+
# Fix the issues resulting from Debian DFSG tarball and patching
79+
COMMAND
80+
"${CMAKE_COMMAND}"
81+
-E copy bison.texi doc/bison.texi
82+
COMMAND
83+
touch -r doc/local.mk doc/bison.texi
84+
COMMAND
85+
touch -r doc/local.mk examples/c/lexcalc/local.mk
86+
COMMAND
87+
touch -r doc/local.mk examples/local.mk
88+
89+
USING USE_SYSTEM_BISON patch_version extra_flags
90+
BUILD_CONDITION ${test_system_bison}
91+
BUILD [[
92+
CONFIGURE_COMMAND
93+
"${SOURCE_DIR}/configure"
94+
"--prefix=${CMAKE_INSTALL_PREFIX}"
95+
$<$<BOOL:@CMAKE_CROSSCOMPILING@>:
96+
--host=${SUPERBUILD_TOOLCHAIN_TRIPLET}
97+
>
98+
--enable-relocatable
99+
--disable-nls
100+
--disable-silent-rules
101+
"CC=${SUPERBUILD_CC}"
102+
"CXX=${SUPERBUILD_CXX}"
103+
"CPPFLAGS=${SUPERBUILD_CPPFLAGS}"
104+
"CFLAGS=${SUPERBUILD_CFLAGS}"
105+
"CXXFLAGS=${SUPERBUILD_CXXFLAGS}"
106+
"LDFLAGS=${SUPERBUILD_LDFLAGS}"
107+
INSTALL_COMMAND
108+
"$(MAKE)" install "DESTDIR=${DESTDIR}${INSTALL_DIR}"
109+
COMMAND
110+
"${CMAKE_COMMAND}" -E copy
111+
"<SOURCE_DIR>/../bison-patches-${patch_version}/copyright"
112+
"${DESTDIR}${CMAKE_STAGING_PREFIX}/share/doc/copyright/bison-${patch_version}.txt"
113+
]]
114+
)

‎doxygen-1.8.13.cmake‎ renamed to ‎doxygen-1.8.20.cmake‎

Lines changed: 10 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
2828
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2929

30-
set(version 1.8.13)
31-
set(download_hash SHA256=af667887bd7a87dc0dbf9ac8d86c96b552dfb8ca9c790ed1cbffaa6131573f6b)
32-
set(patch_version ${version}-10)
33-
set(patch_hash SHA256=e4fb3fa4266998c4192dcdbb1efb563360f1f009d9a80d445721d526de4f9482)
34-
set(base_url https://snapshot.debian.org/archive/debian/20180312T232337Z/pool/main/d/doxygen/)
30+
set(version 1.8.20)
31+
set(download_hash SHA256=3dbdf8814d6e68233d5149239cb1f0b40b4e7b32eef2fd53de8828fedd7aca15)
32+
set(patch_version ${version}-1)
33+
set(patch_hash SHA256=16271cdae86fcda19f5078442e49148db48f087c046da517641230408b2702ae)
34+
set(base_url https://snapshot.debian.org/archive/debian/20200914T084139Z/pool/main/d/doxygen/)
3535

3636
option(USE_SYSTEM_DOXYGEN "Use the system DOXYGEN if possible" ON)
3737

@@ -44,48 +44,6 @@ set(test_system_doxygen [[
4444
set(BUILD_CONDITION 0)
4545
endif()
4646
endif()
47-
if(CMAKE_C_COMPILER_ID MATCHES "Clang")
48-
set(extra_flags "-Wno-tautological-constant-out-of-range-compare -Wno-deprecated-declarations" PARENT_SCOPE)
49-
elseif(CMAKE_C_COMPILER_ID STREQUAL "GNU")
50-
set(extra_flags "-Wno-return-type -Wno-deprecated" PARENT_SCOPE)
51-
else()
52-
set(extra_flags "" PARENT_SCOPE)
53-
endif()
54-
]])
55-
56-
57-
# Fix mingw64 builds
58-
# https://github.com/msys2/MINGW-packages/blob/b99b3d396d8d3dfcee41548d1b96729464bde4e5/mingw-w64-doxygen/fix-casts.patch
59-
set(fix-casts_patch [[
60-
--- doxygen-1.8.6/qtools/qcstring.cpp.orig 2013-05-19 19:12:31.000000000 +0400
61-
+++ doxygen-1.8.6/qtools/qcstring.cpp 2014-04-04 06:54:07.313800000 +0400
62-
@@ -476,7 +476,7 @@
63-
if ( to > first && *(to-1) == 0x20 )
64-
to--;
65-
*to = '\0';
66-
- result.resize( (int)((long)to - (long)result.data()) + 1 );
67-
+ result.resize( (int)(reinterpret_cast<intptr_t>(to) - reinterpret_cast<intptr_t>(result.data())) + 1 );
68-
return result;
69-
}
70-
71-
@@ -717,7 +717,7 @@
72-
int res;
73-
uchar c;
74-
if ( !s1 || !s2 )
75-
- return s1 == s2 ? 0 : (int)((long)s2 - (long)s1);
76-
+ return s1 == s2 ? 0 : (int)(reinterpret_cast<intptr_t>(s2) - reinterpret_cast<intptr_t>(s1));
77-
for ( ; !(res = (c=tolower(*s1)) - tolower(*s2)); s1++, s2++ )
78-
if ( !c ) // strings are equal
79-
break;
80-
@@ -731,7 +731,7 @@
81-
int res;
82-
uchar c;
83-
if ( !s1 || !s2 )
84-
- return (int)((long)s2 - (long)s1);
85-
+ return (int)(reinterpret_cast<uintptr_t>(s2) - reinterpret_cast<uintptr_t>(s1));
86-
for ( ; len--; s1++, s2++ ) {
87-
if ( (res = (c=tolower(*s1)) - tolower(*s2)) )
88-
return res;
8947
]])
9048

9149

@@ -103,32 +61,24 @@ superbuild_package(
10361
VERSION ${patch_version}
10462
DEPENDS
10563
source:doxygen-patches-${patch_version}
64+
bison
10665
libiconv
10766
zlib
10867

10968
SOURCE
11069
URL ${base_url}doxygen_${version}.orig.tar.gz
11170
URL_HASH ${download_hash}
112-
11371
PATCH_COMMAND
114-
patch -p1 -i fix-casts.patch
115-
COMMAND
116-
sed -i -e "/set.ICONV_DIR/d" CMakeLists.txt
117-
COMMAND
118-
sed -i -e "/bigobj/d" CMakeLists.txt
119-
COMMAND
120-
sed -i -e "s/mmacosx-version-min=10.5/mmacosx-version-min=10.11/" CMakeLists.txt
121-
122-
SOURCE_WRITE
123-
fix-casts.patch fix-casts_patch
72+
"${CMAKE_COMMAND}"
73+
-Dpackage=doxygen-patches-${patch_version}
74+
-P "${APPLY_PATCHES_SERIES}"
12475

12576
USING USE_SYSTEM_DOXYGEN patch_version extra_flags
12677
BUILD_CONDITION ${test_system_doxygen}
12778
BUILD [[
12879
CMAKE_ARGS
12980
"-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}"
130-
"-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} ${extra_flags}"
131-
"-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} ${extra_flags}"
81+
"-DCMAKE_BUILD_TYPE=Release"
13282
-Denglish_only=1
13383
INSTALL_COMMAND
13484
"${CMAKE_COMMAND}" --build . --target install/strip/fast

0 commit comments

Comments
 (0)