1 |
tetromino 13/03/03 20:17:37 |
2 |
|
3 |
Added: orbit-2.14.19-fPIC.patch |
4 |
Log: |
5 |
Add pic USE flag to fix libbonobo build failure on hardened systems (bug #312161, thanks to arackhaen and Magnus Granberg). |
6 |
|
7 |
(Portage version: 2.2.0_alpha164/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 gnome-base/orbit/files/orbit-2.14.19-fPIC.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/orbit/files/orbit-2.14.19-fPIC.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/orbit/files/orbit-2.14.19-fPIC.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: orbit-2.14.19-fPIC.patch |
16 |
=================================================================== |
17 |
From 31236105deaa4b50a70aa256819bfc4790f705d8 Mon Sep 17 00:00:00 2001 |
18 |
From: Alexandre Rostovtsev <tetromino@g.o> |
19 |
Date: Sun, 3 Mar 2013 13:29:24 -0500 |
20 |
Subject: [PATCH] Add an option to build libname-server-2.a's objects as PIC |
21 |
|
22 |
Needed for Gentoo hardened, see https://bugs.gentoo.org/show_bug.cgi?id=312161 |
23 |
--- |
24 |
configure.in | 9 +++++++++ |
25 |
src/services/name/Makefile.am | 1 + |
26 |
2 files changed, 10 insertions(+) |
27 |
|
28 |
diff --git a/configure.in b/configure.in |
29 |
index 0879051..38b7b8b 100644 |
30 |
--- a/configure.in |
31 |
+++ b/configure.in |
32 |
@@ -118,6 +118,15 @@ if test z$enable_purify = zyes; then |
33 |
AC_DEFINE(ORBIT_PURIFY, 1, [defined if purify is enabled]) |
34 |
fi |
35 |
|
36 |
+AC_ARG_ENABLE([libname-server-pic], |
37 |
+ [AS_HELP_STRING([--enable-libname-server-pic], [force libname-server-2.a to be built as PIC])]) |
38 |
+if test x$enable_libname_server_pic = xyes; then |
39 |
+ LIBNAME_SERVER_PIC=$lt_prog_compiler_pic |
40 |
+else |
41 |
+ LIBNAME_SERVER_PIC= |
42 |
+fi |
43 |
+AC_SUBST(LIBNAME_SERVER_PIC) |
44 |
+ |
45 |
AC_MSG_CHECKING(which idl compiler to use) |
46 |
IDL_COMPILER="\$(top_builddir)/src/idl-compiler/orbit-idl-2\$(EXEEXT)" |
47 |
AC_ARG_WITH(idl-compiler, |
48 |
diff --git a/src/services/name/Makefile.am b/src/services/name/Makefile.am |
49 |
index 7212557..21b7365 100644 |
50 |
--- a/src/services/name/Makefile.am |
51 |
+++ b/src/services/name/Makefile.am |
52 |
@@ -65,6 +65,7 @@ name_client_2_LDADD = $(LDADDS) |
53 |
libname_server_2_a_SOURCES = orbit-name-server.c CosNaming-skels.c \ |
54 |
name-support.c name-support.h |
55 |
libname_server_2_a_DEPENDENCIES = $(DEPS) CosNaming.h |
56 |
+libname_server_2_a_CFLAGS = $(INCLUDES) $(LIBNAME_SERVER_PIC) |
57 |
|
58 |
orbit_name_server_2_SOURCES = boot.c |
59 |
orbit_name_server_2_LDFLAGS = $(FLAGS) |
60 |
-- |
61 |
1.8.1.5 |