[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/06: gnu: lib3mf: Remove bundled software.
From: |
guix-commits |
Subject: |
04/06: gnu: lib3mf: Remove bundled software. |
Date: |
Mon, 9 Jan 2023 18:24:03 -0500 (EST) |
mbakke pushed a commit to branch master
in repository guix.
commit f29a17c84b305068ab8593cff00570d728e49496
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Mon Jan 9 22:21:47 2023 +0100
gnu: lib3mf: Remove bundled software.
* gnu/packages/engineering.scm (lib3mf)[source](snippet): Delete bundled
copies of libzip and zlib. Adjust header inclusions.
---
gnu/packages/engineering.scm | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 627be59fcd..c9fe587170 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2305,7 +2305,25 @@ engineers for reverse engineers.")
(snippet
'(begin
;; 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)
(arguments
`(#:configure-flags (list "-DUSE_INCLUDED_ZLIB=0"
- branch master updated (8423ca9da8 -> 79a9bb25bc), guix-commits, 2023/01/09
- 04/06: gnu: lib3mf: Remove bundled software.,
guix-commits <=
- 02/06: gnu: lib3mf: Remove bundled ACT., guix-commits, 2023/01/09
- 01/06: gnu: Add automatic-component-toolkit., guix-commits, 2023/01/09
- 06/06: gnu: perftest: Update to 4.5-0.20., guix-commits, 2023/01/09
- 03/06: gnu: lib3mf: Remove input labels., guix-commits, 2023/01/09
- 05/06: gnu: lib3mf: Update to 2.2.0., guix-commits, 2023/01/09