Download as
Browse Code »

Commit b72c2222b90df5d077d2e128e99e801145f52f45

Authored by Perry Werneck
1 parent a1359805
Exists in master and in 1 other branch develop

WIN32 Static build should include libwinpthread to avoid unnecessary dll 

dependencies on windows.
Showing 3 changed files with 8 additions and 3 deletions   Show diff stats
client/Makefile.in
  Diff comments   View file @b72c222
@@ -105,9 +105,12 @@ CFLAGS= \ @@ -105,9 +105,12 @@ CFLAGS= \
105 @LIB3270_CFLAGS@ \ 105 @LIB3270_CFLAGS@ \
106 @DBUS_CFLAGS@ 106 @DBUS_CFLAGS@
107 107
108 -LDFLAGS=@STATIC_LDFLAGS@ @LDFLAGS@ 108 +LDFLAGS=\
  109 + @STATIC_LDFLAGS@ \
  110 + @LDFLAGS@
109 111
110 LIBS= \ 112 LIBS= \
  113 + @STATIC_LIBS@ \
111 @LIBS@ \ 114 @LIBS@ \
112 @LIBICONV@ \ 115 @LIBICONV@ \
113 @INTL_LIBS@ \ 116 @INTL_LIBS@ \
client/sdk/ipc3270-static.pc.in
  Diff comments   View file @b72c222
@@ -8,7 +8,7 @@ product_name=@PRODUCT_NAME@ @@ -8,7 +8,7 @@ product_name=@PRODUCT_NAME@
8 Name: @PACKAGE_NAME@-static 8 Name: @PACKAGE_NAME@-static
9 Description: @PACKAGE_DESCRIPTION@ (static library) 9 Description: @PACKAGE_DESCRIPTION@ (static library)
10 Version: @PACKAGE_VERSION@ 10 Version: @PACKAGE_VERSION@
11 -Libs: -lipc3270.static @LIB3270_LIBS@ @DBUS_LIBS@ @LIBS@ @LIBICONV@ @INTL_LIBS@ 11 +Libs: -lipc3270.static @LIB3270_LIBS@ @STATIC_LIBS@ @DBUS_LIBS@ @LIBS@ @LIBICONV@ @INTL_LIBS@
12 Cflags: -I@includedir@ 12 Cflags: -I@includedir@
13 13
14 14
@@ -67,9 +67,9 @@ APP_RESOURCES="" @@ -67,9 +67,9 @@ APP_RESOURCES=""
67 APP_LDFLAGS="" 67 APP_LDFLAGS=""
68 DLL_LDFLAGS="-shared" 68 DLL_LDFLAGS="-shared"
69 STATIC_LDFLAGS="" 69 STATIC_LDFLAGS=""
  70 +STATIC_LIBS=""
70 CLIENT_TARGETS="shared devel" 71 CLIENT_TARGETS="shared devel"
71 72
72 -  
73 dnl --------------------------------------------------------------------------- 73 dnl ---------------------------------------------------------------------------
74 dnl Check for OS specifics 74 dnl Check for OS specifics
75 dnl --------------------------------------------------------------------------- 75 dnl ---------------------------------------------------------------------------
@@ -83,6 +83,7 @@ case "$host" in @@ -83,6 +83,7 @@ case "$host" in
83 LIBS="$LIBS -lws2_32 -lwtsapi32 -lcomdlg32 -lkernel32" 83 LIBS="$LIBS -lws2_32 -lwtsapi32 -lcomdlg32 -lkernel32"
84 LDFLAGS="$LDFLAGS" 84 LDFLAGS="$LDFLAGS"
85 STATIC_LDFLAGS="-static -static-libgcc -static-libstdc++" 85 STATIC_LDFLAGS="-static -static-libgcc -static-libstdc++"
  86 + STATIC_LIBS="-Wl,-Bstatic,--whole-archive -lwinpthread -Wl,--no-whole-archive,-Bdynamic"
86 DLLEXT=".dll" 87 DLLEXT=".dll"
87 DLLPREFIX="" 88 DLLPREFIX=""
88 89
@@ -123,6 +124,7 @@ AC_SUBST(LOGDIR) @@ -123,6 +124,7 @@ AC_SUBST(LOGDIR)
123 AC_SUBST(DLLEXT) 124 AC_SUBST(DLLEXT)
124 AC_SUBST(DLLPREFIX) 125 AC_SUBST(DLLPREFIX)
125 AC_SUBST(STATIC_LDFLAGS) 126 AC_SUBST(STATIC_LDFLAGS)
  127 +AC_SUBST(STATIC_LIBS)
126 128
127 AC_CHECK_FUNC(vasprintf, AC_DEFINE(HAVE_VASPRINTF) ) 129 AC_CHECK_FUNC(vasprintf, AC_DEFINE(HAVE_VASPRINTF) )
128 130