[X2Go-Commits] [x2goserver] 02/02: x2goserver.spec: also pass %{__global_{c{, pp}, ld}flags} down via {C, LD}FLAGS.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goserver.

commit 34353d2f1d801ab196a48c900b8ccdfccd5682c4
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Nov 16 00:40:37 2018 +0100

    x2goserver.spec: also pass %{__global_{c{,pp},ld}flags} down via {C,LD}FLAGS.
---
 debian/changelog | 1 +
 x2goserver.spec  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 213f44d..1845523 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -54,6 +54,7 @@ x2goserver (4.1.0.3-0x2go1) UNRELEASED; urgency=medium
   * x2goserver.spec:
     + Pull in openSUSE-release manually on OpenSuSE Tumbleweed to work around
       a bug.
+    + Also pass %{__global_{c{,pp},ld}flags} down via {C,LD}FLAGS.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 14 Aug 2018 16:41:40 +0200
 
diff --git a/x2goserver.spec b/x2goserver.spec
index 680d2f0..5f51408 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -622,7 +622,7 @@ sed -i -e 's,/lib/,/%{_lib}/,' x2goserver/bin/x2gopath
 sed -i -e 's/-o root -g root//' */Makefile
 
 %build
-make CFLAGS="%{optflags} -fPIC" %{?_smp_mflags} PERL_INSTALLDIRS=vendor PREFIX=%{_prefix} NXLIBDIR=%{_libdir}/nx
+make %{?_smp_mflags} CFLAGS="%{?__global_cppflags} %{?__global_cflags} %{optflags}" LDFLAGS="%{?__global_ldflags}" PERL_INSTALLDIRS=vendor PREFIX=%{_prefix} NXLIBDIR=%{_libdir}/nx
 
 
 %install

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git