cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace LTO fix with hunk from upstream PR

Browse Source
This commit is contained in:
kn 2022-12-28 10:17:31 +00:00
parent 1af4b10c3b
commit c18991ac31
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
security/qdigidoc4/Makefile
View File

@ -3,6 +3,7 @@ COMMENT = DigiDoc4 GUI client for signing and encrypting documents
V = 4.2.14
DISTNAME = qdigidoc4-${V}
CATEGORIES = security x11
REVISION = 0
DEBUG_PACKAGES = ${BUILD_PACKAGES}

17
security/qdigidoc4/patches/patch-CMakeLists_txt
View File

@ -1,17 +1,16 @@
XXX revert breaking "Fix LTO linking"
https://github.com/open-eid/DigiDoc4-Client/pull/1110
apply part of pending "Fix clang buid other hosts"
https://github.com/open-eid/DigiDoc4-Client/pull/1146
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -22,10 +22,6 @@ set_env( TSL_INCLUDE "EE" CACHE STRING "TSL list inclu
@@ -22,7 +22,8 @@ set_env( TSL_INCLUDE "EE" CACHE STRING "TSL list inclu
set_env( MOBILEID_URL "https://dd-mid.ria.ee/mid-api" CACHE STRING "URL for Mobile-ID" )
set_env( SMARTID_URL "https://dd-sid.ria.ee/v1" CACHE STRING "URL for Smart-ID" )
set(CMAKE_INTERPROCEDURAL_OPTIMIZATION YES)
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-object_path_lto,lto.o")
- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-object_path_lto,lto.o")
-endif()
set(CPACK_PACKAGE_VERSION ${VERSION})
set(CPACK_GENERATOR RPM)
set(CPACK_PACKAGE_CONTACT "RIA <info@ria.ee>")
+set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_DEBUG NO)
+if(CMAKE_CXX_COMPILER_ID MATCHES "AppleClang")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-object_path_lto,lto.o")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-object_path_lto,lto.o")
endif()