Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build-style/cmake: set CMAKE_BUILD_TYPE to None #29459

Merged
merged 62 commits into from
Apr 3, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
ea31e83
amdvlk: allow CMAKE_BUILD_TYPE=None
sgn Mar 15, 2021
d5a40c3
eigen*: set CMAKE_BUILD_TYPE to Release
sgn Mar 16, 2021
d626b78
embree: don't ignore CXXFLAGS, fix build with ispc 1.13+
sgn Mar 17, 2021
36d0789
ettercap: remove libressl patch, CMAKE_BUILD_TYPE=None
sgn Mar 17, 2021
7d8a519
injeqt: disable coverage
sgn Mar 17, 2021
5d498bb
kindd: build with CMAKE_BUILD_TYPE=None
sgn Mar 17, 2021
d8b6b16
occt: allow CMAKE_BUILD_TYPE=None
sgn Mar 18, 2021
b1cbec3
renderdoc: devendor zstd, lz4
sgn Mar 19, 2021
4afa93f
python3-occ: build with CMAKE_BUILD_TYPE=None
sgn Mar 19, 2021
b033ca5
widelands: allow CMAKE_BUILD_TYPE=None
sgn Mar 19, 2021
7839e89
zziplib: fix SONAME when build with -DCMAKE_BUILD_TYPE=None
sgn Mar 20, 2021
d943b37
mellowplayer: fix build
sgn Mar 21, 2021
77f4f82
ispc: fix CMAKE_BUILD_TYPE=None
sgn Mar 21, 2021
fb97ba2
darktable: fix CMAKE_BUILD_TYPE=None
sgn Mar 21, 2021
44a95e2
hedgewars: merge -data back
sgn Mar 21, 2021
8fcb165
mariadb: fix for CMAKE_BUILD_TYPE=None
sgn Mar 21, 2021
a159d94
EternalTerminal: remove -ggdb3
sgn Mar 25, 2021
63f75ca
OTPClient: respect CFLAGS
sgn Mar 25, 2021
106c788
crex: hardening
sgn Mar 25, 2021
9194e1a
libbaseencode: hardening
sgn Mar 25, 2021
02e0695
bibletime: clean build flags
sgn Mar 26, 2021
53040b5
boomerang: clean build flags
sgn Mar 26, 2021
c59ddcc
catimg: don't change our build-type
sgn Mar 26, 2021
41cf2ab
libcotp: fix build flags
sgn Mar 26, 2021
57367a7
loudgain: hardening
sgn Mar 26, 2021
4670c44
msg2: hardening
sgn Mar 26, 2021
4d2890d
ippusbxd: fix cflags -O2 not -o2
sgn Mar 26, 2021
db4fec6
tlsh: respect -g + hardening
sgn Mar 26, 2021
ac28a59
poppler: hardening + respect -g
sgn Mar 26, 2021
5b5012b
poppler-qt5: hardening + respect -g
sgn Mar 26, 2021
fd1b306
artyfx: remove -O1 -g
sgn Mar 27, 2021
dc7aff0
coin3: build with CMAKE_BUILD_TYPE=None
sgn Mar 27, 2021
0e1b651
conky: don't overwrite CMAKE_BUILD_TYPE
sgn Mar 27, 2021
fddf392
conky-cli: don't overwrite CMAKE_BUILD_TYPE
sgn Mar 27, 2021
6ef1456
crossguid: don't overwrite -O2
sgn Mar 27, 2021
4feaa33
rapidjson: define -DNDEBUG
sgn Mar 27, 2021
3f6198c
cura-engine: ignore -O3
sgn Mar 27, 2021
3e0728c
dislocker: remove -O1
sgn Mar 27, 2021
03adf7c
freeorion: remove -O3
sgn Mar 27, 2021
13a02ba
cglm: fix build flags
sgn Mar 26, 2021
5ad300f
glyr: don't force Release build
sgn Mar 27, 2021
09487de
hugin: remove -O3
sgn Mar 27, 2021
981574a
ledger: don't overwrite CMAKE_BUILD_TYPE
sgn Mar 27, 2021
dfdd7c8
libmygpo-qt: remove -ggdb3
sgn Mar 27, 2021
7ff3ebc
libogre: don't build vendored libraries
sgn Mar 27, 2021
44eb48c
libopenglrecorder: remove -O3
sgn Mar 27, 2021
d56662e
libvidstab: remove -O3
sgn Mar 27, 2021
34ea9f0
openlierox: don't overwrote CMAKE_BUILD_TYPE
sgn Mar 27, 2021
92b7a14
opensonic: don't overwrite CMAKE_BUILD_TYPE
sgn Mar 27, 2021
12b8026
rocksdb: don't overwrite CMAKE_BUILD_TYPE
sgn Mar 27, 2021
17f0347
seexpr-krita: don't overwrite CMAKE_BUILD_TYPE
sgn Mar 27, 2021
e2b0cc6
speed-dreams: hardening
sgn Mar 27, 2021
e2f8037
traverso: hardening
sgn Mar 27, 2021
bb3a94e
xstarter: hardening
sgn Mar 27, 2021
c48f788
yabause-gtk: ignore -O3
sgn Mar 27, 2021
84b80b4
ympd: hardening
sgn Mar 27, 2021
8743de2
z80ex: hardening
sgn Mar 27, 2021
43c0677
scribus: don't overwrite cmake-build-type
sgn Mar 27, 2021
9834775
yoshimi: cleanup, don't overwrite CMAKE_BUILD_TYPE
sgn Mar 28, 2021
d342ec4
zulucrypt: remove -O3
sgn Mar 28, 2021
8048e39
zbackup: don't overwrite CMAKE_BUILD_TYPE
sgn Mar 28, 2021
2376856
rofs-filtered: hardening
sgn Mar 27, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 17 additions & 0 deletions srcpkgs/EternalTerminal/patches/fix-cflags.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
Index: EternalTerminal-et-v6.0.13/CMakeLists.txt
===================================================================
--- EternalTerminal-et-v6.0.13.orig/CMakeLists.txt
+++ EternalTerminal-et-v6.0.13/CMakeLists.txt
@@ -26,12 +26,6 @@ if(DISABLE_CRASH_LOG)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DELPP_DISABLE_DEFAULT_CRASH_HANDLING")
ENDIF(DISABLE_CRASH_LOG)

-if(UNIX)
- # Enable debug info
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -ggdb3")
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -ggdb3")
-endif()
-
# Enable C++-11
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
1 change: 1 addition & 0 deletions srcpkgs/EternalTerminal/template
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ homepage="https://eternalterminal.dev/"
distfiles="https://github.com/MisterTea/EternalTerminal/archive/et-v${version}.tar.gz"
checksum=728c3a444d666897c710e33fe473d8d289263a59574451b13aa53ec3c6ac88b3
system_accounts="_eternal"
patch_args=-Np1

LDFLAGS="-lgflags"

Expand Down
17 changes: 17 additions & 0 deletions srcpkgs/OTPClient/patches/fix-cflags.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
Index: OTPClient-2.4.2/CMakeLists.txt
===================================================================
--- OTPClient-2.4.2.orig/CMakeLists.txt
+++ OTPClient-2.4.2/CMakeLists.txt
@@ -11,11 +11,10 @@ option(BUILD_GUI "Build the GUI" ON)
option(BUILD_CLI "Build the CLI" ON)

set(CMAKE_C_STANDARD 11)
-set(CMAKE_C_FLAGS "-Wall -Wextra -O3 -Wformat=2 -Wmissing-format-attribute -fstack-protector-strong -Wundef -Wmissing-format-attribute")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wformat=2 -Wmissing-format-attribute -fstack-protector-strong -Wundef -Wmissing-format-attribute")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fdiagnostics-color=always -Wstrict-prototypes -Wunreachable-code")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wchar-subscripts -Wwrite-strings -Wpointer-arith -Wbad-function-cast -Wcast-align")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror=format-security -Werror=implicit-function-declaration -Wno-sign-compare")
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3")
if(CMAKE_COMPILER_IS_GNUCC)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pie -fPIE")
endif()
1 change: 1 addition & 0 deletions srcpkgs/OTPClient/template
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ license="GPL-3.0-or-later"
homepage="https://github.com/paolostivanin/OTPClient"
distfiles="https://github.com/paolostivanin/OTPClient/archive/v${version}.tar.gz"
checksum=74bc4312aa1cd336ca983434e3bed951c5ead327091e7708e3beb08508813495
patch_args=-Np1
60 changes: 60 additions & 0 deletions srcpkgs/amdvlk/patches/cmake-build-type-none.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
Index: llvm-project/llvm/CMakeLists.txt
===================================================================
--- llvm-project/llvm/CMakeLists.txt.orig
+++ llvm-project/llvm/CMakeLists.txt
@@ -251,11 +251,6 @@ endif()

string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)

-if (CMAKE_BUILD_TYPE AND
- NOT uppercase_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
- message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
-endif()
-
set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" )

set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')")
Index: pal/cmake/Modules/AmdCmakeHelper.cmake
===================================================================
--- pal/cmake/Modules/AmdCmakeHelper.cmake.orig
+++ pal/cmake/Modules/AmdCmakeHelper.cmake
@@ -37,11 +37,6 @@ if (CMAKE_CONFIGURATION_TYPES)
else()
string(TOUPPER "${CMAKE_BUILD_TYPE}" capital_CMAKE_BUILD_TYPE)

- if (CMAKE_BUILD_TYPE AND
- NOT capital_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
- message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
- endif()
-
if(capital_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
set(CMAKE_BUILD_TYPE_DEBUG ON)
set(CMAKE_BUILD_TYPE_RELEASE OFF)
Index: xgl/CMakeLists.txt
===================================================================
--- xgl/CMakeLists.txt.orig
+++ xgl/CMakeLists.txt
@@ -181,11 +181,6 @@ if (CMAKE_CONFIGURATION_TYPES)
else()
string(TOUPPER "${CMAKE_BUILD_TYPE}" capital_CMAKE_BUILD_TYPE)

- if (CMAKE_BUILD_TYPE AND
- NOT capital_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
- message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
- endif()
-
if(capital_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
set(CMAKE_BUILD_TYPE_DEBUG ON)
set(CMAKE_BUILD_TYPE_RELEASE OFF)
Index: xgl/icd/CMakeLists.txt
===================================================================
--- xgl/icd/CMakeLists.txt.orig
+++ xgl/icd/CMakeLists.txt
@@ -84,7 +84,6 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Cl
endif()

if(CMAKE_BUILD_TYPE_RELEASE)
- target_compile_options(xgl PRIVATE -O3)
if(XGL_ENABLE_LTO)
if(${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
4 changes: 2 additions & 2 deletions srcpkgs/artyfx/patches/fix-avtk-cmake-sse.patch
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

-SET(CMAKE_C_FLAGS "-fPIC -msse -msse2 -mfpmath=sse -g") # -fsanitize=address
-SET(CMAKE_CXX_FLAGS "-fPIC -msse -msse2 -mfpmath=sse -g") # -fsanitize=address
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -g") # -fsanitize=address
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -g") # -fsanitize=address
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") # -fsanitize=address
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") # -fsanitize=address
+
+IF(BUILD_SSE)
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse -msse2 -mfpmath=sse")
Expand Down
4 changes: 2 additions & 2 deletions srcpkgs/artyfx/patches/respect-our-cflags.patch
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ Index: CMakeLists.txt
-SET(CMAKE_C_FLAGS "-g -Wall -O1 -Wno-unused-variable")
-SET(CMAKE_CXX_FLAGS "-g -Wall -O1 -Wno-unused-variable -ftree-vectorize")
+SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fPIC -shared -L./src/avtk -Wl,--no-undefined")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall -O1 -Wno-unused-variable")
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -O1 -Wno-unused-variable -ftree-vectorize")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-unused-variable")
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unused-variable -ftree-vectorize")


# DSP sources
Expand Down
13 changes: 13 additions & 0 deletions srcpkgs/bibletime/patches/fix-cflags.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Index: bibletime-3.0/cmake/BTApplication.cmake
===================================================================
--- bibletime-3.0.orig/cmake/BTApplication.cmake
+++ bibletime-3.0/cmake/BTApplication.cmake
@@ -41,7 +41,7 @@ IF(WIN32)
ADD_COMPILE_OPTIONS("/Zi")
ELSE()
ADD_COMPILE_OPTIONS(
- "-ggdb" "-Wall" "-Wextra"
+ "-Wall" "-Wextra" "-DNDEBUG" "-DQT_NO_DEBUG"
"$<$<STREQUAL:$<CONFIGURATION>,Release>:-O2>"
"$<$<STREQUAL:$<CONFIGURATION>,Release>:-DNDEBUG>"
"$<$<STREQUAL:$<CONFIGURATION>,Release>:-DQT_NO_DEBUG>"
1 change: 1 addition & 0 deletions srcpkgs/bibletime/template
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ license="GPL-2.0-or-later"
homepage="http://bibletime.info"
distfiles="https://github.com/bibletime/bibletime/releases/download/v${version}/bibletime-${version}.tar.xz"
checksum=d6beef62ad44b255e3dc4c5e89214bf01a0e85c9136073b0be12fca3d2b22622
patch_args=-Np1

pre_build() {
. /etc/profile.d/10_openjdk11.sh
Expand Down
21 changes: 21 additions & 0 deletions srcpkgs/boomerang/patches/fix-cflags.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
Index: cmake-scripts/boomerang-flags.cmake
===================================================================
--- cmake-scripts/boomerang-flags.cmake
+++ cmake-scripts/boomerang-flags.cmake
@@ -104,16 +104,6 @@ endif ()


if (NOT MSVC)
- if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
- BOOMERANG_ADD_COMPILE_FLAGS(-O0)
- elseif ("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo")
- # No special flags
- elseif ("${CMAKE_BUILD_TYPE}" STREQUAL "MinSizeRel")
- BOOMERANG_ADD_COMPILE_FLAGS(-Os)
- else () # Release
- BOOMERANG_ADD_COMPILE_FLAGS(-O3)
- endif ()
-
if (BOOMERANG_ENABLE_COVERAGE)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-arcs -ftest-coverage")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage")
12 changes: 12 additions & 0 deletions srcpkgs/catimg/patches/fix-cflags.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Index: catimg-2.7.0/CMakeLists.txt
===================================================================
--- catimg-2.7.0.orig/CMakeLists.txt
+++ catimg-2.7.0/CMakeLists.txt
@@ -11,7 +11,6 @@ endif()
#set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall -Wextra -g -std=c99 -Wno-unused-result")
#set(CMAKE_BUILD_TYPE Debug)
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Wall -Wextra -Os -std=c99 -Wno-unused-result")
-set(CMAKE_BUILD_TYPE Release)

set(SRC ${PROJECT_SOURCE_DIR}/src)

2 changes: 1 addition & 1 deletion srcpkgs/catimg/template
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ license="MIT"
homepage="https://github.com/posva/catimg"
distfiles="https://github.com/posva/catimg/archive/${version}.tar.gz"
checksum=3a6450316ff62fb07c3facb47ea208bf98f62abd02783e88c56f2a6508035139

patch_args=-Np1
CFLAGS="-fcommon"

post_install() {
Expand Down
13 changes: 13 additions & 0 deletions srcpkgs/cglm/patches/fix-cflags.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Index: cglm-0.7.6/CMakeLists.txt
===================================================================
--- cglm-0.7.6.orig/CMakeLists.txt
+++ cglm-0.7.6/CMakeLists.txt
@@ -25,7 +25,7 @@ if(MSVC)
add_definitions(-DNDEBUG -D_WINDOWS -D_USRDLL -DCGLM_EXPORTS -DCGLM_DLL)
add_compile_options(/W3 /Ox /Gy /Oi /TC)
else()
- add_compile_options(-Wall -Werror -O3)
+ add_compile_options(-Wall)
endif()

if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
1 change: 1 addition & 0 deletions srcpkgs/cglm/template
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ license="MIT"
homepage="https://github.com/recp/cglm"
distfiles="https://github.com/recp/cglm/archive/v${version}.tar.gz"
checksum=29ff8af4edc03697e36d3e6f99a80b884a80ee09d46055ce45765e5d6b2456d9
patch_args=-Np1

post_install() {
vlicense LICENSE
Expand Down
5 changes: 4 additions & 1 deletion srcpkgs/coin3/template
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ revision=1
wrksrc="coin-Coin-${version}"
build_style=cmake
configure_args="-DCMAKE_INSTALL_INCLUDEDIR=/usr/include/Coin3
-DCMAKE_BUILD_TYPE=Release -DCOIN_BUILD_TESTS=OFF -DCOIN_BUILD_DOCUMENTATION=ON"
-DCOIN_BUILD_TESTS=OFF -DCOIN_BUILD_DOCUMENTATION=ON"
hostmakedepends="doxygen graphviz"
makedepends="boost-devel glu-devel"
short_desc="High-level 3D graphics toolkit"
Expand All @@ -15,6 +15,9 @@ homepage="https://coin3d.github.io/"
distfiles="https://github.com/coin3d/coin/archive/Coin-${version}.tar.gz"
checksum=b00d2a8e9d962397cf9bf0d9baa81bcecfbd16eef675a98c792f5cf49eb6e805

CFLAGS=-DNDEBUG
CXXFLAGS=-DNDEBUG

if [ "$CROSS_BUILD" ]; then
# bypass runtime test (quote hashing is fine with gcc 9.3)
configure_args+=" -DHAVE_HASH_QUOTING_EXITCODE=0"
Expand Down
2 changes: 1 addition & 1 deletion srcpkgs/conky-cli/template
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ revision=1
wrksrc="${pkgname/-cli/}-${version}"
build_style=cmake
conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf"
configure_args="-DCMAKE_BUILD_TYPE=Release -DMAINTAINER_MODE=ON -DRELEASE=ON
configure_args="-DMAINTAINER_MODE=ON -DRELEASE=ON
-DDOC_PATH=share/doc/${pkgname} -DBUILD_X11=OFF -DBUILD_CURL=ON -DBUILD_XDBE=OFF
-DBUILD_RSS=ON -DBUILD_WEATHER_METAR=OFF -DBUILD_IMLIB2=OFF -DBUILD_WLAN=ON
-DBUILD_DOCS=ON"
Expand Down
2 changes: 1 addition & 1 deletion srcpkgs/conky/template
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ version=1.12.1
revision=1
build_style=cmake
conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf"
configure_args="-DCMAKE_BUILD_TYPE=Release -DMAINTAINER_MODE=ON -DRELEASE=ON
configure_args="-DMAINTAINER_MODE=ON -DRELEASE=ON
-DDOC_PATH=share/doc/${pkgname} -DBUILD_X11=ON -DBUILD_CURL=ON -DBUILD_XDBE=ON
-DBUILD_RSS=ON -DBUILD_WEATHER_METAR=ON -DBUILD_IMLIB2=ON -DBUILD_WLAN=ON
-DBUILD_LUA_CAIRO=ON -DBUILD_LUA_IMLIB2=ON -DBUILD_LUA_RSVG=ON
Expand Down
20 changes: 20 additions & 0 deletions srcpkgs/crex/patches/fix-cflags.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
Index: crex-0.2.5/CMakeLists.txt
===================================================================
--- crex-0.2.5.orig/CMakeLists.txt
+++ crex-0.2.5/CMakeLists.txt
@@ -13,9 +13,6 @@ endif(CCACHE_FOUND)
set (CMAKE_CXX_STANDARD 14)
set (CMAKE_CXX_STANDARD_REQUIRED ON)

-set (CMAKE_CXX_FLAGS "-fdiagnostics-color=auto")
-set (CMAKE_C_FLAGS "-fdiagnostics-color=auto")
-
set (DEBUG_FLAGS "-Wpedantic -Wall -Wextra -Wcast-align -Wcast-qual -Wctor-dtor-privacy -Wdisabled-optimization -Wformat=2 -Winit-self -Wlogical-op -Wmissing-declarations -Wmissing-include-dirs -Wnoexcept -Wold-style-cast -Woverloaded-virtual -Wredundant-decls -Wshadow -Wsign-conversion -Wsign-promo -Wstrict-null-sentinel -Wstrict-overflow=5 -Wswitch-default -Wundef -Wno-unused -std=c++14 -g")
set (DEBUG_LINK_FLAGS "-fprofile-arcs -ftest-coverage -flto")

@@ -56,4 +53,4 @@ target_link_libraries (
${TARGET}
)

-install (TARGETS ${TARGET} DESTINATION "/usr/local/bin")
+install (TARGETS ${TARGET} DESTINATION "/usr/bin")
7 changes: 2 additions & 5 deletions srcpkgs/crex/template
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
# Template file for 'crex'
pkgname=crex
version=0.2.5
revision=1
revision=2
build_style=cmake
short_desc="Explore, test, and check regular expressions in the terminal"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
license="MIT"
homepage="https://github.com/octobanana/crex"
distfiles="https://github.com/octobanana/crex/archive/${version}.tar.gz"
checksum=c6a166b7a1e696a7babeaf7c5728eece1624704a18357f827129fc95ef2ecc56

pre_configure() {
sed -e 's|/local/|/|' -i CMakeLists.txt
}
patch_args=-Np1

post_install() {
vlicense LICENSE
Expand Down
12 changes: 12 additions & 0 deletions srcpkgs/crossguid/fix-cflags.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.5.1)
project(CrossGuid)

set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")

option(XG_TESTS "Build test runner" ON)

13 changes: 13 additions & 0 deletions srcpkgs/cura-engine/patches/fix-cflags.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -42,7 +42,7 @@ endif()
if(CMAKE_BUILD_TYPE_UPPER MATCHES "DEBUG")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG_INIT}")
else()
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE_INIT}")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNDEBUG")
endif()

set(CMAKE_CXX_STANDARD 11)
14 changes: 14 additions & 0 deletions srcpkgs/darktable/patches/cmake-build-type-none.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
Index: src/external/rawspeed/cmake/build-type.cmake
===================================================================
--- src/external/rawspeed/cmake/build-type.cmake.orig
+++ src/external/rawspeed/cmake/build-type.cmake
@@ -27,9 +27,6 @@ string(TOUPPER "${RAWSPEED_SPECIAL_BUILD

# is this one of the known build types?
list (FIND CMAKE_CONFIGURATION_TYPES_UPPERCASE ${CMAKE_BUILD_TYPE_UPPERCASE} BUILD_TYPE_IS_KNOWN)
-if (${BUILD_TYPE_IS_KNOWN} EQUAL -1)
- message(SEND_ERROR "Unknown build type: ${CMAKE_BUILD_TYPE_UPPERCASE}. Please specify one of: ${CMAKE_CONFIGURATION_TYPES}")
-endif()

# is this a special build?
list (FIND RAWSPEED_SPECIAL_BUILD_TYPES_UPPERCASE ${CMAKE_BUILD_TYPE_UPPERCASE} IS_SPECIAL_BUILD)
13 changes: 13 additions & 0 deletions srcpkgs/dislocker/patches/fix-cflags.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Index: src/CMakeLists.txt
===================================================================
--- src/CMakeLists.txt.orig
+++ src/CMakeLists.txt
@@ -71,7 +71,7 @@ if(NOT DEFINED WARN_FLAGS)
set (WARN_FLAGS "-Wall -Wextra" CACHE STRING "" FORCE)
endif()
if(NOT DEFINED HARDEN_FLAGS)
- set (HARDEN_FLAGS "-fstack-protector -fstrict-aliasing -D_FORTIFY_SOURCE=2 -O1" CACHE STRING "" FORCE)
+ set (HARDEN_FLAGS "-fstack-protector -fstrict-aliasing" CACHE STRING "" FORCE)
endif()

set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
1 change: 1 addition & 0 deletions srcpkgs/eigen/template
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ pkgname=eigen
version=3.3.9
revision=1
build_style=cmake
configure_args="-DCMAKE_BUILD_TYPE=Release"
short_desc="C++ template library for linear algebra (version 3.x)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MPL-2.0, GPL-3.0-or-later, LGPL-2.1-or-later, BSD-3-Clause"
Expand Down
1 change: 1 addition & 0 deletions srcpkgs/eigen3.2/template
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ version=3.2.10
revision=3
wrksrc="eigen-${version}"
build_style=cmake
configure_args="-DCMAKE_BUILD_TYPE=Release"
short_desc="C++ template library for linear algebra (version 3.x)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MPL-2.0, GPL-3.0-or-later, LGPL-2.1-or-later, BSD-3-Clause"
Expand Down
12 changes: 12 additions & 0 deletions srcpkgs/embree/patches/uintNN-is-part-of-ispc-1.13.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Index: embree-2.17.7/tutorials/common/common.isph
===================================================================
--- embree-2.17.7.orig/tutorials/common/common.isph
+++ embree-2.17.7/tutorials/common/common.isph
@@ -16,7 +16,3 @@

#pragma once

-typedef unsigned int64 uint64;
-typedef unsigned int32 uint32;
-typedef unsigned int16 uint16;
-typedef unsigned int8 uint8;