Install shared libraries into "lib". Do not create symbolic links to static libraries since only shared libraries are built. --- a/cmake/layers/ufid.cmake +++ b/cmake/layers/ufid.cmake @@ -6,10 +6,7 @@ bde_prefixed_override(ufid project_setup_install_opts) function(ufid_project_setup_install_opts proj) bde_assert_no_extra_args() - set(libPath "bin/so") - if (${bde_ufid_is_64}) - string(APPEND libPath "/64") - endif() + set(libPath "lib") bde_struct_create( installOpts @@ -86,13 +83,6 @@ function(bde_create_ufid_symlink uor installOpts) "${symlinkPrefix}/${symlinkDir}/${libLinkName}" ) - install( - CODE - "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \ - ${symlinkVal} ${symlinkFile})" - COMPONENT "${component}-symlinks" - ) - # This code creates compatibility symlinks # WARNING: This is custom logic that has nothing to do with our build system. # Some external build systems expect to find a variaty of ufids in dpkg. @@ -110,14 +100,6 @@ function(bde_create_ufid_symlink uor installOpts) symlinkFile "${symlinkPrefix}/${symlinkDir}/${libLinkName}" ) - - # IMPORTANT: symlinkFile is the same as above! - install( - CODE - "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \ - ${symlinkVal} ${symlinkFile})" - COMPONENT "${component}-symlinks" - ) endif() if (${bde_ufid_is_pic}) @@ -134,14 +116,6 @@ function(bde_create_ufid_symlink uor installOpts) "${symlinkPrefix}/${symlinkDir}/${libLinkName}" ) - # IMPORTANT: symlinkFile is the same as above! - install( - CODE - "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \ - ${symlinkVal} ${symlinkFile})" - COMPONENT "${component}-pic-symlink-hack" - ) - # And another one for "64" - remove "pic", add "64" if (${bde_ufid_is_64}) set(temp_ufid_flags ${install_ufid_flags}) @@ -157,14 +131,6 @@ function(bde_create_ufid_symlink uor installOpts) symlinkFile "${symlinkPrefix}/${symlinkDir}/${libLinkName}" ) - - # IMPORTANT: symlinkFile is the same as above! - install( - CODE - "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \ - ${symlinkVal} ${symlinkFile})" - COMPONENT "${component}-pic-symlink-hack" - ) endif() endif() @@ -177,18 +143,5 @@ function(bde_create_ufid_symlink uor installOpts) symlinkReleaseFile "${symlinkPrefix}/${symlinkDir}/${libReleaseLinkName}" ) - install( - CODE - "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \ - ${symlinkVal} ${symlinkReleaseFile})" - COMPONENT "${component}-release-symlink" - ) - install( - CODE - "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \ - ${symlinkVal} ${symlinkReleaseFile})" - COMPONENT "release-symlink" - EXCLUDE_FROM_ALL - ) endif() endfunction() e. (build): Accept and pass on #:built-in-builders. * guix/channels.scm (build-from-source, build-channel-instance, channel-instance-derivations, channel-instances->manifest, channel-instances->derivation): Accept and pass on #:built-in-builders. Change-Id: I315c990de66c6f7dca25a859165a5568abe385ea Christopher Baines 2021-11-27build-self: Help users to submit useful bug reports....* build-aux/build-self.scm (build): Request the ‘COMPLETE output’. Tobias Geerinckx-Rice 2021-04-29download: Use Disarchive as a last resort....This is a fixed version of 66b14dccdd0d83c875ce3a8d50ceab8b6f0a3ce2, which was reverted in e74250c3c535b75dd2225a26df51febb7ed94654. * guix/download.scm (%disarchive-mirrors): New variable. (%disarchive-mirror-file): New variable. (built-in-download): Add 'disarchive-mirrors' keyword argument and pass its value along to the 'builtin:download' derivation. (url-fetch): Pass '%disarchive-mirror-file' to 'built-in-download'. * guix/scripts/perform-download.scm (perform-download): Read Disarchive mirrors from the environment and pass them to 'url-fetch'. * guix/build/download.scm (disarchive-fetch/any): New procedure. (url-fetch): Add 'disarchive-mirrors' keyword argument, use it to make a list of URIs, and use the new procedure to fetch the file if all other methods fail. * build-aux/build-self.scm (build-program)[select?]: Exclude '(guix build download)'. * guix/self.scm (compiled-guix)[*core-modules*]: Add 'guile-json' to the list of extensions. Timothy Sample