Project

General

Profile

Feature #24481

system bzip vs boost

Added by Marc Mengel 4 months ago.

Status:
New
Priority:
Normal
Assignee:
-
Target version:
-
Start date:
05/27/2020
Due date:
% Done:

0%

Estimated time:
Duration:

Description

Need a pull request for this

or a better one for lib_or_lib64() maybe?

diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py
index 452ae99b..34ff2b1 100644
--- a/var/spack/repos/builtin/packages/boost/package.py
+++ b/var/spack/repos/builtin/packages/boost/package.py
@@ -301,11 +301,31 @@ def determine_b2_options(self, spec, options):
             options.extend(['-s', 'ICU_PATH=%s' % spec['icu'].prefix])

         if '+iostreams' in spec:
-            options.extend([
+            if os.path.isdir(spec['bzip2'].prefix.lib64):
+                options.extend([
+                '-s', 'BZIP2_INCLUDE=%s' % spec['bzip2'].prefix.include,
+                '-s', 'BZIP2_LIBPATH=%s' % spec['bzip2'].prefix.lib64
+                 ])
+                print("doing bzip2 lib64")
+            else:
+                options.extend([
                 '-s', 'BZIP2_INCLUDE=%s' % spec['bzip2'].prefix.include,
-                '-s', 'BZIP2_LIBPATH=%s' % spec['bzip2'].prefix.lib,
+                '-s', 'BZIP2_LIBPATH=%s' % spec['bzip2'].prefix.lib
+                 ])
+                print("doing bzip2 lib")
+            if os.path.isdir(spec['zlib'].prefix.lib64):
+                options.extend([
                 '-s', 'ZLIB_INCLUDE=%s' % spec['zlib'].prefix.include,
-                '-s', 'ZLIB_LIBPATH=%s' % spec['zlib'].prefix.lib,
+                '-s', 'ZLIB_LIBPATH=%s' % spec['zlib'].prefix.lib64
+                 ])
+                print("doing zlib lib64")
+            else:
+                options.extend([
+                '-s', 'ZLIB_INCLUDE=%s' % spec['zlib'].prefix.include,
+                '-s', 'ZLIB_LIBPATH=%s' % spec['zlib'].prefix.lib
+                 ])
+                print("doing zlib lib")
+            options.extend([
                 '-s', 'NO_LZMA=1',
                 '-s', 'NO_ZSTD=1'])



Also available in: Atom PDF