me/guix
Archived
1
0
Fork 0
Code Activity

gnu: lib3mf: Remove bundled software.

Browse source 
* gnu/packages/engineering.scm (lib3mf)[source](snippet): Delete bundled
copies of libzip and zlib.  Adjust header inclusions.
This commit is contained in:
Marius Bakke 2023-01-09 22:21:47 +01:00
parent 5e36d4381f
commit f29a17c84b
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
gnu/packages/engineering.scm
View file

@ -2305,7 +2305,25 @@ engineers for reverse engineers.")
(snippet (snippet
'(begin '(begin
;; Delete pre-compiled ACT. ;; Delete pre-compiled ACT.
(delete-file-recursively "AutomaticComponentToolkit/bin"))))) (delete-file-recursively "AutomaticComponentToolkit/bin")
;; Remove bundled software. Preserve cpp-base64 as it has been
;; modified and cannot easily be unbundled.
(for-each delete-file-recursively
'("Include/Libraries/libzip"
"Include/Libraries/zlib"
"Source/Libraries/libzip"
"Source/Libraries/zlib"))
;; Adjust header includes such that system headers are found.
(substitute* '("Include/Common/OPC/NMR_OpcPackageReader.h"
"Include/Common/Platform/NMR_ImportStream_ZIP.h"
"Include/Common/Platform/NMR_ExportStream_ZIP.h"
"Include/Common/Platform/NMR_ImportStream_Compressed.h"
"Include/Common/Platform/NMR_ExportStream_Compressed.h"
"Source/Common/Platform/NMR_PortableZIPWriterEntry.cpp")
(("Libraries/libzip/") "")
(("Libraries/zlib/") ""))))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags (list "-DUSE_INCLUDED_ZLIB=0" `(#:configure-flags (list "-DUSE_INCLUDED_ZLIB=0"