[Pkg-gnupg-commit] [gnupg2] 97/118: Portability build fix.

Daniel Kahn Gillmor dkg at fifthhorseman.net
Thu Sep 15 18:25:16 UTC 2016


This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch encoding-and-speling
in repository gnupg2.

commit eddcba038025cdbd58aaf67cafd6d83f0ea042d5
Author: Ben Kibbey <bjk at luxsci.net>
Date:   Sat Sep 10 13:42:09 2016 -0400

    Portability build fix.
    
    * kbx/Makefile.am: Add NETLIBS.
    * dirmngr/Makefile.am: Ditto for dirmngr_ldap.
    --
    
    Fixes OpenIndiana (Solaris) builds.
    
    Signed-off-by: Ben Kibbey <bjk at luxsci.net>
---
 dirmngr/Makefile.am | 2 +-
 kbx/Makefile.am     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am
index 6b0a1e1..b7bc21d 100644
--- a/dirmngr/Makefile.am
+++ b/dirmngr/Makefile.am
@@ -95,7 +95,7 @@ dirmngr_ldap_CFLAGS = $(GPG_ERROR_CFLAGS) $(LIBGCRYPT_CFLAGS)
 dirmngr_ldap_LDFLAGS =
 dirmngr_ldap_LDADD = $(libcommon) no-libgcrypt.o \
 		     $(GPG_ERROR_LIBS) $(LIBGCRYPT_LIBS) $(LDAPLIBS) \
-		     $(LBER_LIBS) $(LIBINTL) $(LIBICONV)
+		     $(LBER_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS)
 endif
 
 dirmngr_client_SOURCES = dirmngr-client.c
diff --git a/kbx/Makefile.am b/kbx/Makefile.am
index 95138e0..912dd76 100644
--- a/kbx/Makefile.am
+++ b/kbx/Makefile.am
@@ -61,6 +61,7 @@ kbxutil_SOURCES = kbxutil.c $(common_sources)
 kbxutil_CFLAGS = $(AM_CFLAGS) -DKEYBOX_WITH_X509=1
 kbxutil_LDADD   = ../common/libcommon.a \
                   $(KSBA_LIBS) $(LIBGCRYPT_LIBS) $(extra_libs) \
-                  $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV) $(W32SOCKLIBS)
+                  $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV) $(W32SOCKLIBS) \
+		  $(NETLIBS)
 
 $(PROGRAMS) : ../common/libcommon.a

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git



More information about the Pkg-gnupg-commit mailing list