From ccd4292a18ecfb45ecd52d565ddd32b5a8ba2e72 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Fri, 4 Oct 2019 09:53:55 -0300 Subject: [PATCH] Adjusting windows build options. --- configure.ac | 3 ++- rpm/python-tn3270.spec | 11 +++++------ src/include/config.h.in | 1 + src/session/tools.cc | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 9f88b39..6560f26 100644 --- a/configure.ac +++ b/configure.ac @@ -60,7 +60,7 @@ dnl --------------------------------------------------------------------------- dnl Version info dnl --------------------------------------------------------------------------- -app_cv_description="Python binding for pw3270/lib3270" +app_cv_description="Python bindings for lib3270/pw3270" AC_SUBST(PACKAGE_DESCRIPTION,"$app_cv_description") AC_DEFINE_UNQUOTED(PACKAGE_DESCRIPTION,"$app_cv_description") @@ -101,6 +101,7 @@ case "$host" in CFLAGS="$CFLAGS -pthread -D_WIN32_WINNT=0x0600" CXXFLAGS="$CXXFLAGS -pthread -D_WIN32_WINNT=0x0600" LIBS="$LIBS -lws2_32 -lwtsapi32 -lcomdlg32" + LDFLAGS="$LDFLAGS -static-libgcc -static-libstdc++ -Wl,-Bstatic,--whole-archive -lwinpthread -Wl,--no-whole-archive,-Bdynamic" DLLEXT=".dll" app_win32_revision=$(date +%-y.%-m.%-d.%-H) diff --git a/rpm/python-tn3270.spec b/rpm/python-tn3270.spec index 51045d9..890d183 100644 --- a/rpm/python-tn3270.spec +++ b/rpm/python-tn3270.spec @@ -1,12 +1,12 @@ -Summary: Python Extension Module implementing tn3270 protocol +Summary: Python bindings for lib3270/pw3270 Name: python-tn3270 Version: 5.2 Release: 0 License: GPL-2.0 Source: %{name}-%{version}.tar.xz URL: https://github.com/PerryWerneck/python-tn3270 -Group: Development/Libraries/Python +Group: Development/Libraries/Python BuildRoot: /var/tmp/%{name}-%{version} @@ -24,12 +24,11 @@ BuildRequires: pkgconfig(ipc3270) BuildRequires: python BuildRequires: pkgconfig(python3) -Requires: python +Requires: python %description - -This is an extension for acessing 3270 hosts directly -from python apps. +This is an extension allowing tn3270 acess for python applications +using lib3270 directly or ipc calls to an enabled pw3270 window. %prep diff --git a/src/include/config.h.in b/src/include/config.h.in index 2ea2386..2b8192f 100644 --- a/src/include/config.h.in +++ b/src/include/config.h.in @@ -36,6 +36,7 @@ #undef PACKAGE_REVISION #undef PACKAGE_DESCRIPTION #undef PRODUCT_NAME + #undef USING_STATIC_IPC3270 #undef HAVE_GNUC_VISIBILITY diff --git a/src/session/tools.cc b/src/session/tools.cc index 7567f87..a8f0254 100644 --- a/src/session/tools.cc +++ b/src/session/tools.cc @@ -44,7 +44,7 @@ PyObject * py3270_session_call(PyObject *self, std::function