|
 |
6a5638 |
From 9788af437a99cb2600aeae6e313a43efb2ceb466 Mon Sep 17 00:00:00 2001
|
|
|
dfc2f2 |
From: Alon Levy <alevy@redhat.com>
|
|
|
67137c |
Date: Wed, 6 May 2015 09:04:02 -0400
|
|
|
dfc2f2 |
Subject: [PATCH] gtk/Makefile.am: add PIE flags to libspice-client-glib
|
|
|
dfc2f2 |
|
|
|
6a5638 |
Also to gtk and controller lib
|
|
|
6a5638 |
|
|
|
6a5638 |
Signed-off-by: Pavel Grunt <pgrunt@redhat.com>
|
|
|
dfc2f2 |
---
|
|
|
6a5638 |
src/Makefile.am | 7 +++++++
|
|
|
6a5638 |
src/Makefile.in | 7 +++++++
|
|
|
6a5638 |
src/controller/Makefile.am | 2 ++
|
|
|
6a5638 |
src/controller/Makefile.in | 2 ++
|
|
|
6a5638 |
4 files changed, 18 insertions(+)
|
|
|
dfc2f2 |
|
|
|
07d9f9 |
diff --git a/src/Makefile.am b/src/Makefile.am
|
|
|
6a5638 |
index 78953dd..688a7e8 100644
|
|
|
07d9f9 |
--- a/src/Makefile.am
|
|
|
07d9f9 |
+++ b/src/Makefile.am
|
|
|
6a5638 |
@@ -115,6 +115,7 @@ SPICE_GTK_LDFLAGS_COMMON = \
|
|
|
6a5638 |
-version-info 5:0:0 \
|
|
|
6a5638 |
-no-undefined \
|
|
|
6a5638 |
$(GTK_SYMBOLS_LDFLAGS) \
|
|
|
6a5638 |
+ $(PIE_LDFLAGS) \
|
|
|
6a5638 |
$(NULL)
|
|
|
6a5638 |
|
|
|
6a5638 |
SPICE_GTK_LIBADD_COMMON = \
|
|
|
6a5638 |
@@ -161,6 +162,7 @@ endif
|
|
|
6a5638 |
if WITH_GTK
|
|
|
6a5638 |
EXTRA_libspice_client_gtk_3_0_la_DEPENDENCIES = $(GTK_SYMBOLS_FILE)
|
|
|
6a5638 |
libspice_client_gtk_3_0_la_LDFLAGS = $(SPICE_GTK_LDFLAGS_COMMON)
|
|
|
6a5638 |
+libspice_client_gtk_3_0_la_CPPFLAGS = $(PIE_CFLAGS)
|
|
|
6a5638 |
libspice_client_gtk_3_0_la_LIBADD = $(SPICE_GTK_LIBADD_COMMON)
|
|
|
6a5638 |
libspice_client_gtk_3_0_la_SOURCES = $(SPICE_GTK_SOURCES_COMMON)
|
|
|
6a5638 |
nodist_libspice_client_gtk_3_0_la_SOURCES = $(nodist_SPICE_GTK_SOURCES_COMMON)
|
|
|
6a5638 |
@@ -185,6 +187,11 @@ libspice_client_glib_2_0_la_LDFLAGS = \
|
|
|
6a5638 |
-version-info 14:0:6 \
|
|
|
dfc2f2 |
-no-undefined \
|
|
|
67137c |
$(GLIB_SYMBOLS_LDFLAGS) \
|
|
|
67137c |
+ $(PIE_LDFLAGS) \
|
|
|
dfc2f2 |
+ $(NULL)
|
|
|
dfc2f2 |
+
|
|
|
67137c |
+libspice_client_glib_2_0_la_CPPFLAGS = \
|
|
|
67137c |
+ $(PIE_CFLAGS) \
|
|
|
dfc2f2 |
$(NULL)
|
|
|
dfc2f2 |
|
|
|
dfc2f2 |
libspice_client_glib_2_0_la_LIBADD = \
|
|
|
07d9f9 |
diff --git a/src/Makefile.in b/src/Makefile.in
|
|
|
6a5638 |
index 2ea0804..a5e3a37 100644
|
|
|
07d9f9 |
--- a/src/Makefile.in
|
|
|
07d9f9 |
+++ b/src/Makefile.in
|
|
|
6a5638 |
@@ -790,6 +790,7 @@ SPICE_GTK_LDFLAGS_COMMON = \
|
|
|
6a5638 |
-version-info 5:0:0 \
|
|
|
6a5638 |
-no-undefined \
|
|
|
6a5638 |
$(GTK_SYMBOLS_LDFLAGS) \
|
|
|
6a5638 |
+ $(PIE_LDFLAGS) \
|
|
|
6a5638 |
$(NULL)
|
|
|
6a5638 |
|
|
|
6a5638 |
SPICE_GTK_LIBADD_COMMON = \
|
|
|
6a5638 |
@@ -815,6 +816,7 @@ nodist_SPICE_GTK_SOURCES_COMMON = \
|
|
|
6a5638 |
|
|
|
6a5638 |
@WITH_GTK_TRUE@EXTRA_libspice_client_gtk_3_0_la_DEPENDENCIES = $(GTK_SYMBOLS_FILE)
|
|
|
6a5638 |
@WITH_GTK_TRUE@libspice_client_gtk_3_0_la_LDFLAGS = $(SPICE_GTK_LDFLAGS_COMMON)
|
|
|
6a5638 |
+@WITH_GTK_TRUE@libspice_client_gtk_3_0_la_CPPFLAGS = $(PIE_CFLAGS)
|
|
|
6a5638 |
@WITH_GTK_TRUE@libspice_client_gtk_3_0_la_LIBADD = $(SPICE_GTK_LIBADD_COMMON)
|
|
|
6a5638 |
@WITH_GTK_TRUE@libspice_client_gtk_3_0_la_SOURCES = $(SPICE_GTK_SOURCES_COMMON)
|
|
|
6a5638 |
@WITH_GTK_TRUE@nodist_libspice_client_gtk_3_0_la_SOURCES = $(nodist_SPICE_GTK_SOURCES_COMMON)
|
|
|
6a5638 |
@@ -836,6 +838,11 @@ libspice_client_glib_2_0_la_LDFLAGS = \
|
|
|
6a5638 |
-version-info 14:0:6 \
|
|
|
dfc2f2 |
-no-undefined \
|
|
|
67137c |
$(GLIB_SYMBOLS_LDFLAGS) \
|
|
|
67137c |
+ $(PIE_LDFLAGS) \
|
|
|
dfc2f2 |
+ $(NULL)
|
|
|
dfc2f2 |
+
|
|
|
67137c |
+libspice_client_glib_2_0_la_CPPFLAGS = \
|
|
|
67137c |
+ $(PIE_CFLAGS) \
|
|
|
dfc2f2 |
$(NULL)
|
|
|
dfc2f2 |
|
|
|
dfc2f2 |
libspice_client_glib_2_0_la_LIBADD = \
|
|
|
6a5638 |
diff --git a/src/controller/Makefile.am b/src/controller/Makefile.am
|
|
|
6a5638 |
index fb56986..71dd2bd 100644
|
|
|
6a5638 |
--- a/src/controller/Makefile.am
|
|
|
6a5638 |
+++ b/src/controller/Makefile.am
|
|
|
6a5638 |
@@ -4,6 +4,7 @@ AM_CPPFLAGS = \
|
|
|
6a5638 |
-DG_LOG_DOMAIN=\"GSpiceController\" \
|
|
|
6a5638 |
$(GIO_CFLAGS) \
|
|
|
6a5638 |
$(COMMON_CFLAGS) \
|
|
|
6a5638 |
+ $(PIE_CFLAGS) \
|
|
|
6a5638 |
-Wno-deprecated-declarations \
|
|
|
6a5638 |
$(NULL)
|
|
|
6a5638 |
|
|
|
6a5638 |
@@ -11,6 +12,7 @@ AM_CPPFLAGS = \
|
|
|
6a5638 |
AM_LDFLAGS = \
|
|
|
6a5638 |
-no-undefined \
|
|
|
6a5638 |
$(GIO_LIBS) \
|
|
|
6a5638 |
+ $(PIE_LDFLAGS) \
|
|
|
6a5638 |
$(NULL)
|
|
|
6a5638 |
|
|
|
6a5638 |
AM_VALAFLAGS = \
|
|
|
6a5638 |
diff --git a/src/controller/Makefile.in b/src/controller/Makefile.in
|
|
|
6a5638 |
index 03e67a4..32c1d44 100644
|
|
|
6a5638 |
--- a/src/controller/Makefile.in
|
|
|
6a5638 |
+++ b/src/controller/Makefile.in
|
|
|
6a5638 |
@@ -495,6 +495,7 @@ AM_CPPFLAGS = \
|
|
|
6a5638 |
-DG_LOG_DOMAIN=\"GSpiceController\" \
|
|
|
6a5638 |
$(GIO_CFLAGS) \
|
|
|
6a5638 |
$(COMMON_CFLAGS) \
|
|
|
6a5638 |
+ $(PIE_CFLAGS) \
|
|
|
6a5638 |
-Wno-deprecated-declarations \
|
|
|
6a5638 |
$(NULL)
|
|
|
6a5638 |
|
|
|
6a5638 |
@@ -503,6 +504,7 @@ AM_CPPFLAGS = \
|
|
|
6a5638 |
AM_LDFLAGS = \
|
|
|
6a5638 |
-no-undefined \
|
|
|
6a5638 |
$(GIO_LIBS) \
|
|
|
6a5638 |
+ $(PIE_LDFLAGS) \
|
|
|
6a5638 |
$(NULL)
|
|
|
6a5638 |
|
|
|
6a5638 |
AM_VALAFLAGS = \
|
|
|
dfc2f2 |
--
|
|
|
6a5638 |
2.13.0
|
|
|
dfc2f2 |
|