From 2d72a0097d1324e40946615fd71d2e645e9908a9 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Fri, 9 Feb 2018 09:28:43 -0200 Subject: [PATCH] Tentando incluir a winpthread como estática. --- configure.ac | 4 +++- src/native/Makefile.in | 5 +++-- src/native/private.h | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index f2d175a..2946326 100644 --- a/configure.ac +++ b/configure.ac @@ -35,6 +35,7 @@ dnl --------------------------------------------------------------------------- dnl Initialize defaults dnl --------------------------------------------------------------------------- DLLFLAGS="-shared -Wl,-soname,\$(@F)" +LDSTATIC="" DBG_CFLAGS="-DDEBUG=1" RLS_CFLAGS="-DNDEBUG=1" @@ -57,7 +58,7 @@ case "$host" in DLLEXT=".dll" CFLAGS="$CFLAGS -Wall -Werror -D_WIN32_WINNT=0x0600" - LDFLAGS="-static-libstdc++ -static-libgcc $LDFLAGS" + LDSTATIC="-static-libgcc -static-libstdc++ -Wl,-Bstatic -lstdc++ -lpthread -Wl,-Bdynamic" LIBS="$LIBS -lws2_32 -lntdll -lwtsapi32" LOGDIR=. @@ -105,6 +106,7 @@ AC_SUBST(DLLEXT) AC_SUBST(DLLPREFIX) AC_SUBST(LOGDIR) +AC_SUBST(LDSTATIC) dnl --------------------------------------------------------------------------- dnl Check for other programs diff --git a/src/native/Makefile.in b/src/native/Makefile.in index 98f7b0c..50c3880 100644 --- a/src/native/Makefile.in +++ b/src/native/Makefile.in @@ -69,6 +69,7 @@ LD=@CXX@ LIBS=-lpw3270cpp @LIBS@ @LIBICONV@ CFLAGS=-I../include @CFLAGS@ LDFLAGS=@LDFLAGS@ +LDSTATIC=@LDSTATIC@ #---[ Rules ]---------------------------------------------------------------------------- @@ -133,7 +134,7 @@ $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ @echo $(basename $@) ... @$(MKDIR) `dirname $@` - @$(LD) -shared -Wl,-soname,$(LIBNAME) $(LDFLAGS) -o $@ $^ $(LIBS) + @$(LD) -shared -Wl,-soname,$(LIBNAME) $(LDFLAGS) -o $@ $^ $(LIBS) $(LDSTATIC) #---[ Debug Targets ]-------------------------------------------------------------------- @@ -159,6 +160,6 @@ $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ @echo $(basename $@) ... @$(MKDIR) `dirname $@` - @$(LD) -shared -Wl,-soname,$(LIBNAME) $(LDFLAGS) -o $@ $^ $(LIBS) + @$(LD) -shared -Wl,-soname,$(LIBNAME) $(LDFLAGS) -o $@ $^ $(LIBS) $(LDSTATIC) diff --git a/src/native/private.h b/src/native/private.h index 26ede0e..89cd42c 100644 --- a/src/native/private.h +++ b/src/native/private.h @@ -69,7 +69,7 @@ DLL_PRIVATE void write_trace(const char *fmt, ...); #define trace_to_file( ... ) write_trace(__VA_ARGS__) #else - #define trace( ... ) /* */ + #define trace_to_file( ... ) /* */ #endif // ENABLE_TRACE_TO_FILE #include -- libgit2 0.21.2