[X2Go-Commits] x2gobroker.git - build-main (branch) updated: 0.0.0.1-1-gfba2b53

X2Go dev team git-admin at x2go.org
Sun May 19 13:04:42 CEST 2013


The branch, build-main has been updated
       via  fba2b53e36f84b12f7dfcdfe971149415cae3019 (commit)
      from  6d343a60b4adb1041ba8cbef1839e8fd9ec09642 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 Makefile         |    6 +++++-
 debian/changelog |    7 +++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/Makefile b/Makefile
index 1293dab..07428f6 100755
--- a/Makefile
+++ b/Makefile
@@ -27,6 +27,10 @@ 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
 
+CC      ?= gcc
+CFLAGS  += -fPIE
+LDFLAGS += -pie
+
 RM_FILE=rm -f
 RM_DIR=rmdir -p --ignore-fail-on-non-empty
 
@@ -52,7 +56,7 @@ build: build-arch build-indep
 build-arch: build_setuidwrappers
 
 build_setuidwrappers:
-	gcc -fPIE -pie -o lib/x2gobroker-agent src/x2gobroker-agent.c
+	$(CC) $(CFLAGS) $(LDFLAGS) -o lib/x2gobroker-agent src/x2gobroker-agent.c
 
 build-indep:
 #	run setup.py build+install somewhere here...
diff --git a/debian/changelog b/debian/changelog
index e040920..9c267c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+x2gobroker (0.0.0.2-0~x2go1) UNRELEASED; urgency=low
+
+  * New upstream version (0.0.0.2):
+    - Make CC, CFLAGS and LDFLAGS configurable through build system.
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 13 Feb 2013 12:03:25 +0100
+
 x2gobroker (0.0.0.1-0~x2go1) unstable; urgency=low
 
   * Initial upstream version.


hooks/post-receive
-- 
x2gobroker.git (HTTP(S) Session broker for X2Go)

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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).




More information about the x2go-commits mailing list