summaryrefslogtreecommitdiff
blob: ba5eab47ef0bf2bc7c19bb83e269a62c2c04802b (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
From f9ba4d6428f06f717eb16e83a728f82b314383f1 Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <tetromino@gentoo.org>
Date: Sun, 4 Mar 2012 19:47:17 -0500
Subject: [PATCH] Add libtool wrapper for building introspection under PaX

---
 src/Makefile.am |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index c46160c..2aa94d1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -299,7 +299,7 @@ EPHY_GIR_C_FILES = \
 
 EphyEgg-$(EPIPHANY_API_VERSION).gir: $(INTROSPECTION_SCANNER)
 	$(AM_V_GEN) PKG_CONFIG_PATH=$(top_builddir)/data:$$PKG_CONFIG_PATH \
-	$(INTROSPECTION_SCANNER) -v --warn-all \
+	LIBTOOL="$(LIBTOOL)" $(INTROSPECTION_SCANNER) -v --warn-all \
 		--identifier-prefix=Egg \
 		--symbol-prefix=egg \
 		--namespace=EphyEgg \
@@ -307,6 +307,7 @@ EphyEgg-$(EPIPHANY_API_VERSION).gir: $(INTROSPECTION_SCANNER)
 		--include=Gtk-3.0 \
 		--include=libxml2-2.0 \
 		--library=$(top_builddir)/lib/egg/libegg.la \
+		--libtool="bash $(top_srcdir)/gir-paxctl-lt-wrapper -m" \
 		--pkg=gtk+-3.0 \
 		--pkg=libxml-2.0 \
 		--output=$@ \
@@ -318,6 +319,7 @@ EphyEgg-$(EPIPHANY_API_VERSION).gir: $(INTROSPECTION_SCANNER)
 
 Epiphany-$(EPIPHANY_API_VERSION).gir: EphyEgg-$(EPIPHANY_API_VERSION).gir $(INTROSPECTION_SCANNER) $(EPHY_GIR_H_FILES) \
                                       $(EPHY_GIR_C_FILES) epiphany
+	bash $(top_srcdir)/paxctl.sh -m ./epiphany
 	$(AM_V_GEN) PKG_CONFIG_PATH=$(top_builddir)/data:$$PKG_CONFIG_PATH \
 	$(INTROSPECTION_SCANNER) -v --warn-all \
 		--identifier-prefix=Ephy \
-- 
1.7.8.5