Startsida Utforska Hjälp
Logga in
erkanisik
/
main
spegling av https://github.com/pisilinux/main.git
Bevaka 1
Stjärnmärk 0
Fork 0
Filer Ärenden 0 Wiki
Träd: 0a1fe6cac1
Grenar Taggar
main
/
programming
/
scm
/
subversion
/
files
/
subversion-1.8.0-pie.patch

subversion-1.8.0-pie.patch 2.0 KB
Historik Rå

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556 
  1. diff -uap subversion-1.7.0/build/generator/gen_base.py.pie subversion-1.7.0/build/generator/gen_base.py
    2. 

  2. --- subversion-1.8.0/build/generator/gen_base.py.pie
    3. 

  3. +++ subversion-1.8.0/build/generator/gen_base.py
    4. 

  4. @@ -409,7 +409,7 @@ class TargetLinked(Target):
    5. 

  5.      self.install = options.get('install')
    6. 

  6.      self.compile_cmd = options.get('compile-cmd')
    7. 

  7.      self.sources = options.get('sources', '*.c *.cpp')
    8. 

  8. -    self.link_cmd = options.get('link-cmd', '$(LINK)')
    9. 

  9. +    self.link_cmd = options.get('link-cmd', '$(LINK_LIB)')
    10. 

  10.  
    11. 

  11.      self.external_lib = options.get('external-lib')
    12. 

  12.      self.external_project = options.get('external-project')
    13. 

  13. @@ -465,6 +465,11 @@ class TargetExe(TargetLinked):
    14. 

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

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

  16.  
    17. 

  17. +    if self.install == 'test' or self.install == 'bdb-test':
    18. 

  18. +      self.link_cmd = '$(LINK_TEST)'
    19. 

  19. +    else:
    20. 

  20. +      self.link_cmd = '$(LINK_EXE)'
    21. 

  21. +
    22. 

  22.    def add_dependencies(self):
    23. 

  23.      TargetLinked.add_dependencies(self)
    24. 

  24.  
    25. 

  25. @@ -515,8 +520,8 @@ class TargetLib(TargetLinked):
    26. 

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

  27.  
    28. 

  28.      ### hmm. this is Makefile-specific
    29. 

  29. -    if self.link_cmd == '$(LINK)':
    30. 

  30. -      self.link_cmd = '$(LINK_LIB)'
    31. 

  31. +    if self.install == 'test':
    32. 

  32. +       self.link_cmd = '$(LINK_TEST_LIB)'
    33. 

  33.  
    34. 

  34.  class TargetApacheMod(TargetLib):
    35. 

  35.  
    36. 

  36. --- subversion-1.8.0/Makefile.in.pie
    37. 

  37. +++ subversion-1.8.0/Makefile.in
    38. 

  38. @@ -203,6 +203,9 @@ COMPILE_CXXHL_CXX = $(LIBTOOL) $(LTCXXFL
    39. 

  39.  
    40. 

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

  41.  LINK_LIB = $(LINK) $(LT_SO_VERSION) -rpath $(libdir)
    42. 

  42. +LINK_TEST = $(LINK) -no-install
    43. 

  43. +LINK_TEST_LIB = $(LINK) -avoid-version
    44. 

  44. +LINK_EXE = $(LINK) -pie
    45. 

  45.  LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) -rpath $(libdir)
    46. 

  46.  LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION)
    47. 

  47.  
    48. 

  48. @@ -676,7 +679,7 @@ schema-clean:
    49. 

  49.  	$(PYTHON) $(top_srcdir)/build/transform_sql.py $< $(top_srcdir)/$@
    50. 

  50.  
    51. 

  51.  .c.o:
    52. 

  52. -	$(COMPILE) -o $@ -c $<
    53. 

  53. +	$(COMPILE) -fpie -o $@ -c $<
    54. 

  54.  
    55. 

  55.  .cpp.o:
    56. 

  56.  	$(COMPILE_CXX) -o $@ -c $<
    57.