cvsdist 82a5bfa
cvsdist 82a5bfa
Build subversion executables as PIEs. Requires a slight jig to 
6200cd8
ensure that executables in the test suite are *not* built using
cvsdist 82a5bfa
-pie, since that doesn't work when main() is not itself an
cvsdist 82a5bfa
object built with -pie. 
cvsdist 82a5bfa
6dc2eb3
--- subversion-1.4.0/build.conf.pie
6dc2eb3
+++ subversion-1.4.0/build.conf
6dc2eb3
@@ -416,7 +416,7 @@
6dc2eb3
 lang = python
6dc2eb3
 path = subversion/bindings/swig/python/libsvn_swig_py
6dc2eb3
 libs = libsvn_client libsvn_subr libsvn_delta libsvn_wc aprutil apriconv apr
6dc2eb3
-link-cmd = $(LINK) $(SWIG_PY_LIBS)
6dc2eb3
+link-cmd = $(LINK_LIB) $(SWIG_PY_LIBS)
6dc2eb3
 install = swig-py-lib
6dc2eb3
 # need special build rule to include -DSWIGPYTHON
6dc2eb3
 compile-cmd = $(COMPILE_SWIG_PY)
6dc2eb3
--- subversion-1.4.0/Makefile.in.pie
6dc2eb3
+++ subversion-1.4.0/Makefile.in
6dc2eb3
@@ -139,9 +139,10 @@
cvsdist 82a5bfa
 CPPFLAGS = @CPPFLAGS@ $(EXTRA_CPPFLAGS)
cvsdist 82a5bfa
 LDFLAGS = @LDFLAGS@ $(EXTRA_LDFLAGS)
cvsdist 82a5bfa
 
cvsdist 82a5bfa
-COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES)
cvsdist 82a5bfa
+BASE_COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES)
c772272
+COMPILE = $(BASE_COMPILE) -fpie
cbe0f46
 COMPILE_CXX = $(CXX) $(CPPFLAGS) $(CFLAGS) $(CXXFLAGS) $(INCLUDES)
cbe0f46
-LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE)
cvsdist 82a5bfa
+LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(BASE_COMPILE)
cvsdist 82a5bfa
 
cvsdist 82a5bfa
 # special compilation for files destined for mod_dav_svn
cvsdist 82a5bfa
 COMPILE_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(APACHE_INCLUDES) $(INCLUDES) -o $@ -c
6dc2eb3
@@ -156,8 +157,11 @@
9ebf152
 COMPILE_JAVAHL_JAVAC = $(JAVAC) $(JAVAC_FLAGS)
9ebf152
 COMPILE_JAVAHL_JAVAH = $(JAVAH)
cvsdist 82a5bfa
 
cvsdist 82a5bfa
-LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS)
cvsdist 5b3925e
-LINK_LIB = $(LINK) -rpath $(libdir)
cvsdist 82a5bfa
+BASE_LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS)
cvsdist 82a5bfa
+LINK = $(BASE_LINK) -pie
cvsdist 82a5bfa
+LINK_TEST = $(BASE_LINK) -no-install
cvsdist 5b3925e
+LINK_LIB = $(BASE_LINK) -rpath $(libdir)
cvsdist 82a5bfa
+LINK_TEST_LIB = $(BASE_LINK)
cvsdist 82a5bfa
 
cvsdist 82a5bfa
 # special link rule for mod_dav_svn
6dc2eb3
 LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS)
6dc2eb3
--- subversion-1.4.0/build/generator/gen_base.py.pie
6dc2eb3
+++ subversion-1.4.0/build/generator/gen_base.py
6dc2eb3
@@ -411,6 +411,9 @@
6dc2eb3
     self.manpages = options.get('manpages', '')
6dc2eb3
     self.testing = options.get('testing')
6dc2eb3
 
6dc2eb3
+    if self.install == 'test' or self.install == 'bdb-test':
6dc2eb3
+      self.link_cmd = '$(LINK_TEST)'
6dc2eb3
+
6dc2eb3
   def add_dependencies(self):
6dc2eb3
     TargetLinked.add_dependencies(self)
6dc2eb3
 
6dc2eb3
@@ -453,8 +456,11 @@
6dc2eb3
     self.msvc_fake = options.get('msvc-fake') == 'yes' # has fake target
6dc2eb3
     self.msvc_export = string.split(options.get('msvc-export', ''))
6dc2eb3
 
6dc2eb3
-    ### hmm. this is Makefile-specific
6dc2eb3
-    self.link_cmd = '$(LINK_LIB)'
6dc2eb3
+    ### more Makefile-specific stuff:
6dc2eb3
+    if self.install == 'test':
6dc2eb3
+      self.link_cmd = '$(LINK_TEST_LIB)'
6dc2eb3
+    elif self.link_cmd == '$(LINK)':
6dc2eb3
+      self.link_cmd = '$(LINK_LIB)'
6dc2eb3
 
6dc2eb3
 class TargetApacheMod(TargetLib):
6dc2eb3