This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch 3.6.x-rpm-debug in repository nx-libs. from c261030 Try to workaround weird imake/make issue. new bcf8019 Revert "Try to workaround weird imake/make issue." new cea14ba Export UseTIRPC in env instead. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: nx-X11/programs/Xserver/Imakefile | 6 ++---- nx-X11/programs/Xserver/os/Imakefile | 5 ++--- nx-libs.spec | 8 ++++---- 3 files changed, 8 insertions(+), 11 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x-rpm-debug in repository nx-libs. commit cea14ba154b069061756fd622efca6c1739e891a Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Mar 9 10:21:01 2018 +0100 Export UseTIRPC in env instead. --- nx-libs.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nx-libs.spec b/nx-libs.spec index 9b739a9..d036199 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -412,12 +412,12 @@ chmod a+x my_configure; export SHLIBGLOBALSFLAGS="%{__global_ldflags}" export LOCAL_LDFLAGS="%{__global_ldflags}" export CDEBUGFLAGS="%{?__global_cppflags} %{?__global_cflags} %{?optflags}" -FORCE_TIRPC="NO" +UseTIRPC="NO" %if 0%{?fedora} > 27 || 0%{?suse_version} > 1500 -FORCE_TIRPC="YES" +UseTIRPC="YES" %endif -export FORCE_TIRPC -make %{?_smp_mflags} CONFIGURE="$PWD/my_configure" PREFIX=%{_prefix} LIBDIR=%{_libdir} CDEBUGFLAGS="${CDEBUGFLAGS}" LOCAL_LDFLAGS="${LOCAL_LDFLAGS}" SHLIBGLOBALSFLAGS="${SHLIBGLOBALSFLAGS}" UseTIRPC="${FORCE_TIRPC}" +export UseTIRPC +make %{?_smp_mflags} CONFIGURE="$PWD/my_configure" PREFIX=%{_prefix} LIBDIR=%{_libdir} CDEBUGFLAGS="${CDEBUGFLAGS}" LOCAL_LDFLAGS="${LOCAL_LDFLAGS}" SHLIBGLOBALSFLAGS="${SHLIBGLOBALSFLAGS}" UseTIRPC="${UseTIRPC}" %install make install \ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x-rpm-debug in repository nx-libs. commit bcf80198fa835bdb048da7a01d4e24a4dbfb6c6d Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Mar 9 10:16:13 2018 +0100 Revert "Try to workaround weird imake/make issue." This reverts commit c261030b4dc0eb404396aa44f0282c900c99d20a. --- nx-X11/programs/Xserver/Imakefile | 6 ++---- nx-X11/programs/Xserver/os/Imakefile | 5 ++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index 570815e..57ec4b2 100644 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -296,14 +296,12 @@ ZLIB = $$(pkg-config --exists 'zlib' >/dev/null 2>&1 && pkg-config --libs PNGLIB = `pkg-config --libs libpng` JPEGLIB = -ljpeg +TIRPC_LIB = + #if HasSecureRPC #if UseTIRPC TIRPC_LIB = $$(pkg-config --libs 'libtirpc') -#else -TIRPC_LIB = #endif -#else -TIRPC_LIB = #endif NXAGENT = hw/nxagent/LibraryTargetName(nxagent) diff --git a/nx-X11/programs/Xserver/os/Imakefile b/nx-X11/programs/Xserver/os/Imakefile index 8a1e20c..9308c86 100644 --- a/nx-X11/programs/Xserver/os/Imakefile +++ b/nx-X11/programs/Xserver/os/Imakefile @@ -74,6 +74,8 @@ XDMAUTHOBJS = XDMAUTHSCRS = #endif +TIRPC_INCLUDES = + #if HasSecureRPC RPCDEFS = -DSECURE_RPC RPCOBJS = rpcauth.o @@ -81,15 +83,12 @@ RPCSRCS = rpcauth.c #if UseTIRPC TIRPC_INCLUDES = $$(pkg-config --cflags-only-I 'libtirpc') -#else -TIRPC_INCLUDES = #endif #else RPCDEFS = RPCOBJS = RPCSRCS = -TIRPC_INCLUDES = #endif #if HasBSD44Sockets -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
-
git-admin＠x2go.org