This patch changes metabat so that (1) it is not build statically, (2) it uses shared libraries rather than static libraries where possible. diff --git a/SConstruct b/SConstruct index 69cdc0a..ac99bcb 100644 --- a/SConstruct +++ b/SConstruct @@ -26,8 +26,6 @@ debug = ARGUMENTS.get('DEBUG', None) build_flags = ['-Wall', '-g', '-std=c++11', '-fopenmp'] link_flags = ['-lstdc++', '-lm', '-fopenmp'] -if platform.platform(True, True).find('Darwin') == -1: - link_flags.extend(['-static', '-static-libgcc', '-static-libstdc++']) if debug is None: build_flags.extend(['-O3', '-DNDEBUG', '-Wno-unknown-pragmas', '-Wno-deprecated-declarations', '-Wno-overflow', '-Wno-unused-variable']) @@ -110,17 +108,17 @@ def findStaticOrShared( lib, testPaths, static_source_list, link_flag_list, stat for path in testPaths: if not os.path.isdir(path): continue + for testfile in ('%s/lib%s.so' % (path, lib), '%s/lib%s.dylib' % (path, lib)): + if os.path.isfile(testfile): + print "Found shared library %s as %s" % (lib, testfile) + link_flag_list.extend( ["-L%s" % (path), "-l%s" % (lib) ] ) + return for suffix in staticSuffixes: testfile = '%s/lib%s%s' % (path, lib, suffix) if os.path.isfile(testfile): static_source_list.append(testfile) print "Found static library %s as %s" % (lib, testfile) return - for testfile in ('%s/lib%s.so' % (path, lib), '%s/lib%s.dylib' % (path, lib)): - if os.path.isfile(testfile): - print "Found shared library %s as %s" % (lib, testfile) - link_flag_list.extend( ["-L%s" % (path), "-l%s" % (lib) ] ) - return print "Could not find library for %s!!! Looked in %s" % (lib, testPaths) return ter
path: root/gnu/build/icecat-extension.scm
AgeCommit message (Expand)Author
2023-12-10gnu: ‘make-icecat-extension’ inherits package location....This is an improvement for the purposes of ‘guix edit’ & co. * gnu/build/icecat-extension.scm (make-icecat-extension): Add ‘location’ field. Change-Id: I896ae6823b3fe4ea013fa74e2c536f45664d8042 Ludovic Courtès
2023-10-23gnu: icecat: Support Guix packaged extensions and native manifests....* gnu/build/icecat-extension.scm: New file with a MAKE-ICECAT-EXTENSION procedure that makes sure the add-on directory is a symlink, so that Icecat can normalize it into a package store path. * gnu/local.mk (dist_patch_DATA): Register it, as well as new patches. * gnu/packages/browser-extensions.scm (ublock-origin)[properties]: Store the add-on ID so that it is accessible in MAKE-ICECAT-EXTENSION. [arguments]: Use the add-on ID as root directory. (ublock-origin/icecat): New procedure. * gnu/packages/gnuzilla.scm (icecat-minimal)[arguments]: Rewrite the unused 'apply-guix-specific-patches' phase so that it applies the following two patches. [native-search-paths]: New field. * gnu/packages/patches/icecat-compare-paths.patch: New patch that compares add-on paths (which are package store paths) to detect package changes. * gnu/packages/patches/icecat-use-system-wide-dir.patch: New patch that replaces "/usr/lib/mozilla" (the system-wide directory for extensions and native manifests) with "$ICECAT_SYSTEM_DIR". Clément Lassieur