Re: [PATCH] lib/Module.mk: don't install dynamic library when disabled

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Baruch,

On Tue,  2 Jan 2018 07:00:30 +0200, Baruch Siach wrote:
> Do not attempt to install the dynamic library when build of that library
> is disabled. Fixes the following installation error:
> 
> install -m 755 lib/libi2c.so.0.1.0 .../target/usr/lib
> install: cannot stat 'lib/libi2c.so.0.1.0': No such file or directory
> lib/Module.mk:90: recipe for target 'install-lib' failed
> 
> Cc: Angelo Compagnucci <angelo@xxxxxxxxxxxxxxxxxxxx>
> Signed-off-by: Baruch Siach <baruch@xxxxxxxxxx>
> ---
>  lib/Module.mk | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/lib/Module.mk b/lib/Module.mk
> index 2ebc70d76ed9..c492961e0a4a 100644
> --- a/lib/Module.mk
> +++ b/lib/Module.mk
> @@ -88,9 +88,11 @@ clean-lib:
>  
>  install-lib: $(addprefix $(LIB_DIR)/,$(LIB_TARGETS))
>  	$(INSTALL_DIR) $(DESTDIR)$(libdir)
> +ifeq ($(BUILD_DYNAMIC_LIB),1)
>  	$(INSTALL_PROGRAM) $(LIB_DIR)/$(LIB_SHLIBNAME) $(DESTDIR)$(libdir)
>  	$(LN) $(LIB_SHLIBNAME) $(DESTDIR)$(libdir)/$(LIB_SHSONAME)
>  	$(LN) $(LIB_SHSONAME) $(DESTDIR)$(libdir)/$(LIB_SHBASENAME)
> +endif
>  ifeq ($(BUILD_STATIC_LIB),1)
>  	$(INSTALL_DATA) $(LIB_DIR)/$(LIB_STLIBNAME) $(DESTDIR)$(libdir)
>  endif

Ugh, this avalanche of fix-up patches is getting embarrassing :(

Thanks for the fix, committed.

-- 
Jean Delvare
SUSE L3 Support



[Index of Archives]     [Linux GPIO]     [Linux SPI]     [Linux Hardward Monitoring]     [LM Sensors]     [Linux USB Devel]     [Linux Media]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux