Build subversion executables as PIEs. Requires a slight jig to 

ensure that executables in the test suite are *not* built using

-pie, since that doesn't work when main() is not itself an

object built with -pie. 

--- subversion-1.1.0/build/generator/gen_base.py.pie

+++ subversion-1.1.0/build/generator/gen_base.py

@@ -386,6 +386,9 @@

     self.manpages = options.get('manpages', '')

     self.testing = options.get('testing')

+    if self.install == 'test' or self.install == 'fs-test':

+      self.link_cmd = '$(LINK_TEST)'

+

   def add_dependencies(self, graph, cfg, extmap):

     TargetLinked.add_dependencies(self, graph, cfg, extmap)

@@ -426,8 +429,11 @@

     self.msvc_fake = options.get('msvc-fake') == 'yes' # has fake target

     self.msvc_export = string.split(options.get('msvc-export', ''))

-    ### hmm. this is Makefile-specific

-    self.link_cmd = '$(LINK_LIB)'

+    ### more Makefile-specific stuff:

+    if self.install == 'test':

+      self.link_cmd = '$(LINK_TEST_LIB)'

+    elif self.link_cmd == '$(LINK)':

+      self.link_cmd = '$(LINK_LIB)'

 class TargetApacheMod(TargetLib):

--- subversion-1.1.0/Makefile.in.pie

+++ subversion-1.1.0/Makefile.in

@@ -140,9 +140,10 @@

 CPPFLAGS = @CPPFLAGS@ $(EXTRA_CPPFLAGS)

 LDFLAGS = @LDFLAGS@ $(EXTRA_LDFLAGS)

-COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES)

+BASE_COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES)

+COMPILE = $(BASE_COMPILE) -fpie

 COMPILE_CXX = $(CXX) $(CPPFLAGS) $(CFLAGS) $(CXXFLAGS) $(INCLUDES)

-LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE)

+LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(BASE_COMPILE)

 # special compilation for files destined for mod_dav_svn

 COMPILE_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(APACHE_INCLUDES) $(INCLUDES) -o $@ -c

@@ -160,8 +161,11 @@

 # special compilation for files destined for SWIG/Java

 COMPILE_SWIG_JAVA_JAVAC = $(JAVAC) $(JAVAC_FLAGS)

-LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS)

-LINK_LIB = $(LINK) -rpath $(libdir)

+BASE_LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS)

+LINK = $(BASE_LINK) -pie

+LINK_TEST = $(BASE_LINK) -no-install

+LINK_LIB = $(BASE_LINK) -rpath $(libdir)

+LINK_TEST_LIB = $(BASE_LINK)

 # special link rule for mod_dav_svn

 LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module

--- subversion-1.1.0/build.conf.pie

+++ subversion-1.1.0/build.conf

@@ -347,7 +347,7 @@

 sources = swigutil_py.c

 libs = swig_runtime libsvn_subr libsvn_delta aprutil apriconv apr

 # need SWIG_LDFLAGS to be able to link swig_runtime

-link-cmd = $(LINK) $(SWIG_LDFLAGS) $(SWIG_PY_LIBS)

+link-cmd = $(LINK_LIB) $(SWIG_LDFLAGS) $(SWIG_PY_LIBS)

 install = swig-py-lib

 # need special build rule to include -DSWIGPYTHON

 compile-cmd = $(COMPILE_SWIG_PY)