diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-03-18 18:11:02 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-03-18 18:11:02 +0100 |
| commit | 381c540b937a5e6e8b7007c9c0271ee816bf5417 (patch) | |
| tree | 27191f25f05bbfd48dbf47bbd29f72cb7521482f /gnu/packages/patches/nss-pkgconfig.patch | |
| parent | 49689377a3bab8da08436455ca14a0432fa0e95f (diff) | |
| parent | f401b1e9934a6594d6d7586922aa987e0b24839b (diff) | |
| download | guix-381c540b937a5e6e8b7007c9c0271ee816bf5417.tar guix-381c540b937a5e6e8b7007c9c0271ee816bf5417.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches/nss-pkgconfig.patch')
| -rw-r--r-- | gnu/packages/patches/nss-pkgconfig.patch | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu/packages/patches/nss-pkgconfig.patch b/gnu/packages/patches/nss-pkgconfig.patch index da5c48979e..80c0c5b009 100644 --- a/gnu/packages/patches/nss-pkgconfig.patch +++ b/gnu/packages/patches/nss-pkgconfig.patch @@ -5,6 +5,7 @@ Source: http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/nss/fil Modifications: Change libdir from ${prefix}/lib64 to ${prefix}/lib/nss. Remove optional patching in nss/Makefile. + Include -L$libdir in output from "nss-config --libs". --- nss-3.17.1/nss/config/Makefile +++ nss-3.17.1/nss/config/Makefile @@ -181,7 +182,7 @@ Modifications: +fi + +if test "$echo_libs" = "yes"; then -+ libdirs="" ++ libdirs=-L$libdir + if test -n "$lib_ssl"; then + libdirs="$libdirs -lssl${major_version}" + fi |