Download as
Browse Code »

Commit 2d72a0097d1324e40946615fd71d2e645e9908a9

Authored by Perry Werneck
1 parent 584cbd10
Exists in master

Tentando incluir a winpthread como estática.

Showing 3 changed files with 7 additions and 4 deletions   Show diff stats
@@ -35,6 +35,7 @@ dnl --------------------------------------------------------------------------- @@ -35,6 +35,7 @@ dnl ---------------------------------------------------------------------------
35 dnl Initialize defaults 35 dnl Initialize defaults
36 dnl --------------------------------------------------------------------------- 36 dnl ---------------------------------------------------------------------------
37 DLLFLAGS="-shared -Wl,-soname,\$(@F)" 37 DLLFLAGS="-shared -Wl,-soname,\$(@F)"
  38 +LDSTATIC=""
38 DBG_CFLAGS="-DDEBUG=1" 39 DBG_CFLAGS="-DDEBUG=1"
39 RLS_CFLAGS="-DNDEBUG=1" 40 RLS_CFLAGS="-DNDEBUG=1"
40 41
@@ -57,7 +58,7 @@ case "$host" in @@ -57,7 +58,7 @@ case "$host" in
57 DLLEXT=".dll" 58 DLLEXT=".dll"
58 59
59 CFLAGS="$CFLAGS -Wall -Werror -D_WIN32_WINNT=0x0600" 60 CFLAGS="$CFLAGS -Wall -Werror -D_WIN32_WINNT=0x0600"
60 - LDFLAGS="-static-libstdc++ -static-libgcc $LDFLAGS" 61 + LDSTATIC="-static-libgcc -static-libstdc++ -Wl,-Bstatic -lstdc++ -lpthread -Wl,-Bdynamic"
61 LIBS="$LIBS -lws2_32 -lntdll -lwtsapi32" 62 LIBS="$LIBS -lws2_32 -lntdll -lwtsapi32"
62 63
63 LOGDIR=. 64 LOGDIR=.
@@ -105,6 +106,7 @@ AC_SUBST(DLLEXT) @@ -105,6 +106,7 @@ AC_SUBST(DLLEXT)
105 AC_SUBST(DLLPREFIX) 106 AC_SUBST(DLLPREFIX)
106 107
107 AC_SUBST(LOGDIR) 108 AC_SUBST(LOGDIR)
  109 +AC_SUBST(LDSTATIC)
108 110
109 dnl --------------------------------------------------------------------------- 111 dnl ---------------------------------------------------------------------------
110 dnl Check for other programs 112 dnl Check for other programs
src/native/Makefile.in
  Diff comments   View file @2d72a00
@@ -69,6 +69,7 @@ LD=@CXX@ @@ -69,6 +69,7 @@ LD=@CXX@
69 LIBS=-lpw3270cpp @LIBS@ @LIBICONV@ 69 LIBS=-lpw3270cpp @LIBS@ @LIBICONV@
70 CFLAGS=-I../include @CFLAGS@ 70 CFLAGS=-I../include @CFLAGS@
71 LDFLAGS=@LDFLAGS@ 71 LDFLAGS=@LDFLAGS@
  72 +LDSTATIC=@LDSTATIC@
72 73
73 #---[ Rules ]---------------------------------------------------------------------------- 74 #---[ Rules ]----------------------------------------------------------------------------
74 75
@@ -133,7 +134,7 @@ $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ @@ -133,7 +134,7 @@ $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \
133 134
134 @echo $(basename $@) ... 135 @echo $(basename $@) ...
135 @$(MKDIR) `dirname $@` 136 @$(MKDIR) `dirname $@`
136 - @$(LD) -shared -Wl,-soname,$(LIBNAME) $(LDFLAGS) -o $@ $^ $(LIBS) 137 + @$(LD) -shared -Wl,-soname,$(LIBNAME) $(LDFLAGS) -o $@ $^ $(LIBS) $(LDSTATIC)
137 138
138 #---[ Debug Targets ]-------------------------------------------------------------------- 139 #---[ Debug Targets ]--------------------------------------------------------------------
139 140
@@ -159,6 +160,6 @@ $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ @@ -159,6 +160,6 @@ $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \
159 160
160 @echo $(basename $@) ... 161 @echo $(basename $@) ...
161 @$(MKDIR) `dirname $@` 162 @$(MKDIR) `dirname $@`
162 - @$(LD) -shared -Wl,-soname,$(LIBNAME) $(LDFLAGS) -o $@ $^ $(LIBS) 163 + @$(LD) -shared -Wl,-soname,$(LIBNAME) $(LDFLAGS) -o $@ $^ $(LIBS) $(LDSTATIC)
163 164
164 165
src/native/private.h
  Diff comments   View file @2d72a00
@@ -69,7 +69,7 @@ @@ -69,7 +69,7 @@
69 DLL_PRIVATE void write_trace(const char *fmt, ...); 69 DLL_PRIVATE void write_trace(const char *fmt, ...);
70 #define trace_to_file( ... ) write_trace(__VA_ARGS__) 70 #define trace_to_file( ... ) write_trace(__VA_ARGS__)
71 #else 71 #else
72 - #define trace( ... ) /* */ 72 + #define trace_to_file( ... ) /* */
73 #endif // ENABLE_TRACE_TO_FILE 73 #endif // ENABLE_TRACE_TO_FILE
74 74
75 #include <pw3270cpp.h> 75 #include <pw3270cpp.h>