[PATCH] libnsl: Do not install libnsl.so, libnsl.a if NIS is disabled [BZ #22701]

classic Classic list List threaded Threaded
8 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH] libnsl: Do not install libnsl.so, libnsl.a if NIS is disabled [BZ #22701]

Florian Weimer-5
This also skips building the .o files for libnsl.a.

2018-01-11  Florian Weimer  <[hidden email]>

        * nis/Makefile (install-lib-ldscripts, $(inst_libdir)/libnsl.so):
        Prevent installation of libnsl.so.
        (libnsl-inhibit-o): Do not build (or install) static libraries.

diff --git a/nis/Makefile b/nis/Makefile
index b828c5ec4d..702c31eb63 100644
--- a/nis/Makefile
+++ b/nis/Makefile
@@ -69,7 +69,15 @@ libnss_nis-inhibit-o = $(filter-out .os,$(object-suffixes))
 libnss_nisplus-routines := $(addprefix nisplus-,$(databases)) nisplus-parser \
    nss-nisplus nisplus-initgroups
 libnss_nisplus-inhibit-o = $(filter-out .os,$(object-suffixes))
-endif
+
+else # not $(build-obsolete-nsl)
+# Pretend that libnsl.so is a linker script, so that the symbolic link
+# is not installed.
+install-lib-ldscripts = libnsl.so
+$(inst_libdir)/libnsl.so:
+libnsl-inhibit-o = .o # Build no static libnsl.a.
+
+endif # not $(build-obsolete-nsl)
 
 include ../Rules
 
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] libnsl: Do not install libnsl.so, libnsl.a if NIS is disabled [BZ #22701]

Carlos O'Donell-6
On 01/11/2018 10:21 AM, Florian Weimer wrote:
> This also skips building the .o files for libnsl.a.
>
> 2018-01-11  Florian Weimer  <[hidden email]>
>
> * nis/Makefile (install-lib-ldscripts, $(inst_libdir)/libnsl.so):
> Prevent installation of libnsl.so.
> (libnsl-inhibit-o): Do not build (or install) static libraries.

LGTM.

Reviewed-by: Carlos O'Donell <[hidden email]>

> diff --git a/nis/Makefile b/nis/Makefile
> index b828c5ec4d..702c31eb63 100644
> --- a/nis/Makefile
> +++ b/nis/Makefile
> @@ -69,7 +69,15 @@ libnss_nis-inhibit-o = $(filter-out .os,$(object-suffixes))
>  libnss_nisplus-routines := $(addprefix nisplus-,$(databases)) nisplus-parser \
>     nss-nisplus nisplus-initgroups
>  libnss_nisplus-inhibit-o = $(filter-out .os,$(object-suffixes))
> -endif
> +
> +else # not $(build-obsolete-nsl)
> +# Pretend that libnsl.so is a linker script, so that the symbolic link
> +# is not installed.
> +install-lib-ldscripts = libnsl.so
> +$(inst_libdir)/libnsl.so:
> +libnsl-inhibit-o = .o # Build no static libnsl.a.
> +
> +endif # not $(build-obsolete-nsl)
>  
>  include ../Rules
>  
>


--
Cheers,
Carlos.
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] libnsl: Do not install libnsl.so, libnsl.a if NIS is disabled [BZ #22701]

Andreas Schwab-2
In reply to this post by Florian Weimer-5
Why not just remove libnsl from extra-libs, making the makefile a true
nop?

Andreas.

--
Andreas Schwab, [hidden email]
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] libnsl: Do not install libnsl.so, libnsl.a if NIS is disabled [BZ #22701]

Florian Weimer-5
On 01/12/2018 12:31 PM, Andreas Schwab wrote:
> Why not just remove libnsl from extra-libs, making the makefile a true
> nop?

Wouldn't hat drop the library completely?

We need to install libnsl.so.1.  Thorsten's replacement is not
ABI-compatible, so we still need the glibc version.

Thanks,
Florian
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] libnsl: Do not install libnsl.so, libnsl.a if NIS is disabled [BZ #22701]

Andreas Schwab-2
On Jan 12 2018, Florian Weimer <[hidden email]> wrote:

> We need to install libnsl.so.1.

Right, I missed that.

Andreas.

--
Andreas Schwab, [hidden email]
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."
Reply | Threaded
Open this post in threaded view
|

[PATCH] Build only shared libnsl objects if NIS is disabled (bug 22701)

Andreas Schwab-2
In reply to this post by Florian Weimer-5
        [BZ #22701]
        * nis/Makefile (libnsl-inhibit-o) [$(build-obsolete-nsl) != yes]:
        Build only shared objects.

diff --git a/nis/Makefile b/nis/Makefile
index 01ec4dc357..e7497f7242 100644
--- a/nis/Makefile
+++ b/nis/Makefile
@@ -74,7 +74,8 @@ else # not $(build-obsolete-nsl)
 # is not installed.
 install-lib-ldscripts = libnsl.so
 $(inst_libdir)/libnsl.so:
-libnsl-inhibit-o = .o # Build no static libnsl.a.
+# Build only shared libnsl.
+libnsl-inhibit-o = $(filter-out .os,$(object-suffixes))
 
 endif # not $(build-obsolete-nsl)
 
--
2.16.1


--
Andreas Schwab, [hidden email]
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] Build only shared libnsl objects if NIS is disabled (bug 22701)

Florian Weimer-5
On 01/26/2018 07:05 PM, Andreas Schwab wrote:
> -libnsl-inhibit-o = .o # Build no static libnsl.a.
> +# Build only shared libnsl.
> +libnsl-inhibit-o = $(filter-out .os,$(object-suffixes))

Why is this change needed?  Is it about --enable-profile builds?

Thanks,
Florian
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] Build only shared libnsl objects if NIS is disabled (bug 22701)

Andreas Schwab-2
On Jan 26 2018, Florian Weimer <[hidden email]> wrote:

> On 01/26/2018 07:05 PM, Andreas Schwab wrote:
>> -libnsl-inhibit-o = .o # Build no static libnsl.a.
>> +# Build only shared libnsl.
>> +libnsl-inhibit-o = $(filter-out .os,$(object-suffixes))
>
> Why is this change needed?  Is it about --enable-profile builds?

Yes.

Andreas.

--
Andreas Schwab, [hidden email]
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."