Patchwork [1/2] build: do not link plug-ins against .so libs

login
register
mail settings
Submitter David Disseldorp
Date June 25, 2013, 5:11 p.m.
Message ID <1372180305-24852-1-git-send-email-ddiss@suse.de>
Download mbox | patch
Permalink /patch/254251/
State Accepted
Headers show

Comments

David Disseldorp - June 25, 2013, 5:11 p.m.
Binaries using the plug-ins static library will need to link against
required shared libraries themselves.

Signed-off-by: David Disseldorp <ddiss@suse.de>
---
 src/plug-ins/Makefile.am | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
Chuck Lever - June 25, 2013, 5:39 p.m.
On Jun 25, 2013, at 1:11 PM, David Disseldorp <ddiss@suse.de> wrote:

> Binaries using the plug-ins static library will need to link against
> required shared libraries themselves.

I would rather not make a change like this in -stable unless it is absolutely necessary.  Looks OK for 0.10, though.

> Signed-off-by: David Disseldorp <ddiss@suse.de>
> ---
> src/plug-ins/Makefile.am | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/src/plug-ins/Makefile.am b/src/plug-ins/Makefile.am
> index 9e4ec4d..de362cf 100644
> --- a/src/plug-ins/Makefile.am
> +++ b/src/plug-ins/Makefile.am
> @@ -25,10 +25,7 @@
> 
> lib_LTLIBRARIES		= libnfsjunct.la
> libnfsjunct_la_SOURCES	= nfs-plugin.c
> -libnfsjunct_la_LIBADD	= $(LIBLDAP) $(LIBLBER) $(LIBXML2) \
> -			  $(LIBSQLITE3) $(LIBIDN) $(LIBUUID) \
> -			  $(LIBURIPARSER) $(LIBCRYPTO) $(LIBSSL) \
> -			  $(top_builddir)/src/libnsdb/libnsdb.la \
> +libnfsjunct_la_LIBADD	= $(top_builddir)/src/libnsdb/libnsdb.la \
> 			  $(top_builddir)/src/libxlog/libxlog.la \
> 			  $(top_builddir)/src/libjunction/libjunction.la
> 
> -- 
> 1.8.1.4
> 
> 
> _______________________________________________
> fedfs-utils-devel mailing list
> fedfs-utils-devel@oss.oracle.com
> https://oss.oracle.com/mailman/listinfo/fedfs-utils-devel

Patch

diff --git a/src/plug-ins/Makefile.am b/src/plug-ins/Makefile.am
index 9e4ec4d..de362cf 100644
--- a/src/plug-ins/Makefile.am
+++ b/src/plug-ins/Makefile.am
@@ -25,10 +25,7 @@ 
 
 lib_LTLIBRARIES		= libnfsjunct.la
 libnfsjunct_la_SOURCES	= nfs-plugin.c
-libnfsjunct_la_LIBADD	= $(LIBLDAP) $(LIBLBER) $(LIBXML2) \
-			  $(LIBSQLITE3) $(LIBIDN) $(LIBUUID) \
-			  $(LIBURIPARSER) $(LIBCRYPTO) $(LIBSSL) \
-			  $(top_builddir)/src/libnsdb/libnsdb.la \
+libnfsjunct_la_LIBADD	= $(top_builddir)/src/libnsdb/libnsdb.la \
 			  $(top_builddir)/src/libxlog/libxlog.la \
 			  $(top_builddir)/src/libjunction/libjunction.la