[X2Go-Commits] nx-libs.git - master (branch) updated: redist-server/3.5.0.21-17-g51afd69

X2Go dev team git-admin at x2go.org
Sat Dec 7 23:05:00 CET 2013


The branch, master has been updated
       via  51afd69b23ad2b39403c39720ae519639371b67e (commit)
      from  1ac043b9402b96d6dd58d15a5b17a6039c97ac45 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 51afd69b23ad2b39403c39720ae519639371b67e
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Dec 7 23:04:18 2013 +0100

    The RPM macro for the linker flags does not exist on EPEL. Thus, hardcode __global_ldflags macro for EPEL builds.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    2 ++
 nx-libs.spec     |    2 ++
 2 files changed, 4 insertions(+)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 55c7287..0f04f8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,8 @@ nx-libs (2:3.5.0.22-0x2go1) UNRELEASED; urgency=low
       to the Fedora package maintainers). File differs from the Fedora file
       already.
     + Use local tarball, don't expect  ,,-full'' in tarball name.
+    + The RPM macro for the linker flags does not exist on EPEL. Thus, hardcode
+      __global_ldflags macro for EPEL builds.
 
   [ Clemens Lang ]
   * Add patch 605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full.patch. Fix
diff --git a/nx-libs.spec b/nx-libs.spec
index 07e2ba5..fe68896 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -527,6 +527,8 @@ cat >"my_configure" <<'EOF'
 %configure
 EOF
 chmod a+x my_configure;
+# The RPM macro for the linker flags does not exist on EPEL
+%{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro}
 export SHLIBGLOBALSFLAGS="%{__global_ldflags}"
 make %{?_smp_mflags} CONFIGURE="$PWD/my_configure" USRLIBDIR=%{_libdir}/nx SHLIBDIR=%{_libdir}/nx
 


hooks/post-receive
-- 
nx-libs.git (NX (redistributed))

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "nx-libs.git" (NX (redistributed)).




More information about the x2go-commits mailing list