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() 2626d30d3e0deba6d9265ac4d321113f2'>gnu: erlang: Don't use unstable tarball....* gnu/packages/erlang.scm (erlang)[source]: Use GIT-FETCH and GIT-FILE-NAME. Tobias Geerinckx-Rice 2018-07-17gnu: erlang: Update to 21.0....* gnu/packages/erlang.scm (erlang): Update to 21.0. Signed-off-by: Nils Gillmann <gillmann@infotropique.org> Signed-off-by: Ludovic Courtès <ludo@gnu.org> Nils Gillmann 2018-06-12gnu: erlang: Patch occurrences of /bin/sh in the source....Previously, the elixir package would often fail to build, as running :os:cmd would fail, as /bin/sh doesn't exist when building the elixir package. These changes fix that issue. * gnu/packages/erlang.scm (erlang)[arguments]: Add new patch-/bin/sh phase to replace hardcoded references to /bin/sh with a file in the store. Christopher Baines 2018-06-12gnu: erlang: Delete the bootstrap phase....This fails for the erlang package, as the gnu build system attempts to execute the bootstrap directory. * gnu/packages/erlang.scm (erlang)[arguments]: Delete the bootstrap phase. Christopher Baines 2018-02-19gnu: erlang: Use HTTPS home page....* gnu/packages/erlang.scm (erlang)[home-page]: Use HTTPS with the new canonical domain. Tobias Geerinckx-Rice 2018-02-16gnu: erlang: Update phase style....* gnu/packages/erlang.scm (erlang)[arguments]: Substitute INVOKE for SYSTEM*, don't use %OUTPUTS, and end phases with #t. Tobias Geerinckx-Rice 2018-02-16gnu: erlang: Update to 20.2.3....* gnu/packages/erlang.scm (erlang): Update to 20.2.3. Tobias Geerinckx-Rice 2017-12-13gnu: Erlang: Update to 20.1.7 [fixes CVE-2017-1000385]....* gnu/packages/erlang.scm (erlang): Update to 20.1.7 (native-inputs): Use version-major+minor in the URI of erlang-manpages. Leo Famulari 2017-12-04gnu: erlang: Update to 20.1....* gnu/packages/erlang.scm (erlang): Update to 20.1. Signed-off-by: Ludovic Courtès <ludo@gnu.org> nee