[gentoo-commits] gentoo-x86 commit in net-misc/x2goserver/files: x2goserver-3.1.1.4-cflags.patch

[Bernard Cafarelli (voyageur)]

voyageur    12/10/31 14:23:28

  Added:                x2goserver-3.1.1.4-cflags.patch
  Log:
  Build requires man2html so depend on sys-apps/man, thanks Hans-Peter Deifel <hpdeifel@×××.de> in bug #435652. Server will not work at runtime without font-misc-misc and font-cursor-misc, spotted by rich0 in bug #436156. Respect CFLAGS in sqlitewrapper compilation, bug #426830
  
  (Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key C74525F2)

Revision  Changes    Path
1.1                  net-misc/x2goserver/files/x2goserver-3.1.1.4-cflags.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/x2goserver/files/x2goserver-3.1.1.4-cflags.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/x2goserver/files/x2goserver-3.1.1.4-cflags.patch?rev=1.1&content-type=text/plain

Index: x2goserver-3.1.1.4-cflags.patch
===================================================================
--- x2goserver/Makefile.orig	2012-10-31 15:03:35.734483627 +0100
+++ x2goserver/Makefile	2012-10-31 15:05:55.505918654 +0100
@@ -3,6 +3,10 @@
 SRC_DIR=$(CURDIR)
 SHELL=/bin/bash
 
+CC?=gcc
+CFLAGS+=-fPIE -pie
+LDFLAGS+=
+
 INSTALL_DIR=install -d -o root -g root -m 755
 INSTALL_FILE=install -o root -g root -m 644
 INSTALL_PROGRAM=install -o root -g root -m 755
@@ -37,7 +41,7 @@
 build-arch: build_setgidwrappers
 
 build_setgidwrappers:
-	gcc -fPIE -pie -o x2gosqlitewrapper x2gosqlitewrapper.c
+	$(CC) $(CFLAGS) $(LDFLAGS) -o x2gosqlitewrapper x2gosqlitewrapper.c
 
 build-indep: build_man2html