GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

w32: Explicitly link ws2_32

Browse Source 
* src/Makefile.am (gpgme_w32_extra_libs): New.
(libgpgme_la_LIBADD, libgpgme_glib_la_LIBADD): Use it.

--
Since w32-io.c directly uses functions from ws2_32 it should
not rely on libgpg-error to pull in this dependency.
This commit is contained in:
Andre Heinecke 2020-05-08 16:38:19 +02:00
parent 49c13854f3
commit 52f930c1ed
No known key found for this signature in database
GPG Key ID: 2978E9D40CBABA5C
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Makefile.am
View File

@ -126,6 +126,7 @@ gpgme_res = versioninfo.lo
no_undefined = -no-undefined no_undefined = -no-undefined
export_symbols = -export-symbols $(srcdir)/gpgme.def export_symbols = -export-symbols $(srcdir)/gpgme.def
extra_ltoptions = -XCClinker -static-libgcc extra_ltoptions = -XCClinker -static-libgcc
gpgme_w32_extra_libs = -lws2_32
install-def-file: install-def-file:
-$(INSTALL) -d $(DESTDIR)$(libdir) -$(INSTALL) -d $(DESTDIR)$(libdir)
@ -152,7 +153,7 @@ libgpgme_la_LDFLAGS = $(no_undefined) $(export_symbols) $(extra_ltoptions) \
@LIBGPGME_LT_CURRENT@:@LIBGPGME_LT_REVISION@:@LIBGPGME_LT_AGE@ @LIBGPGME_LT_CURRENT@:@LIBGPGME_LT_REVISION@:@LIBGPGME_LT_AGE@
libgpgme_la_DEPENDENCIES = @LTLIBOBJS@ $(srcdir)/libgpgme.vers $(gpgme_deps) libgpgme_la_DEPENDENCIES = @LTLIBOBJS@ $(srcdir)/libgpgme.vers $(gpgme_deps)
libgpgme_la_LIBADD = $(gpgme_res) @LIBASSUAN_LIBS@ @LTLIBOBJS@ \ libgpgme_la_LIBADD = $(gpgme_res) @LIBASSUAN_LIBS@ @LTLIBOBJS@ \
@GPG_ERROR_LIBS@ @GPG_ERROR_LIBS@ $(gpgme_w32_extra_libs)
if BUILD_W32_GLIB if BUILD_W32_GLIB
libgpgme_glib_la_LDFLAGS = \ libgpgme_glib_la_LDFLAGS = \
@ -162,7 +163,7 @@ libgpgme_glib_la_LDFLAGS = \
libgpgme_glib_la_DEPENDENCIES = @LTLIBOBJS@ \ libgpgme_glib_la_DEPENDENCIES = @LTLIBOBJS@ \
$(srcdir)/libgpgme.vers $(gpgme_deps) $(srcdir)/libgpgme.vers $(gpgme_deps)
libgpgme_glib_la_LIBADD = $(gpgme_res) @LIBASSUAN_LIBS@ @LTLIBOBJS@ \ libgpgme_glib_la_LIBADD = $(gpgme_res) @LIBASSUAN_LIBS@ @LTLIBOBJS@ \
@GPG_ERROR_LIBS@ @GLIB_LIBS@ @GPG_ERROR_LIBS@ @GLIB_LIBS@ $(gpgme_w32_extra_libs)
endif endif
install-data-local: install-def-file install-data-local: install-def-file