View | Details | Raw Unified | Return to issue 89511
Collapse All | Expand All

(-)openoffice.org.orig/binfilter/filter/source/bf_offwrp/makefile.mk (-1 / +1 lines)
Lines 57-63 Link Here
57 
SHL1STDLIBS=    \
 57 
SHL1STDLIBS=    \
58 
				$(FWELIB)			\
 58 
				$(FWELIB)			\
59 
				$(BFBASICLIB) 		\
 59 
				$(BFBASICLIB) 		\
60 
				$(BFSO3LIB) 			\
61 
				$(SJLIB) 			\
 60 
				$(SJLIB) 			\
62 
				$(TKLIB) 			\
 61 
				$(TKLIB) 			\
63 
				$(BFSVTOOLLIB) 		\
 62 
				$(BFSVTOOLLIB) 		\
Lines 75-80 Link Here
75 
				$(BFSDLIB)          \
 74 
				$(BFSDLIB)          \
76 
				$(BFSCLIB)          \
 75 
				$(BFSCLIB)          \
77 
				$(BFSVXLIB)         \
 76 
				$(BFSVXLIB)         \
77 
				$(BFSO3LIB) 			\
78 
				$(UNOTOOLSLIB)		\
 78 
				$(UNOTOOLSLIB)		\
79 
				$(COMPHELPERLIB)	\
 79 
				$(COMPHELPERLIB)	\
80 
				$(LEGACYSMGRLIB)
 80 
				$(LEGACYSMGRLIB)
(-)openoffice.org.orig/solenv/inc/unxlngi6.mk (-1 / +1 lines)
Lines 146-152 Link Here
146 
LINKC*=$(CC)
 146 
LINKC*=$(CC)
147 

          147
          

        

        

          148
          
# default linker flags

          148
          
# default linker flags

        

          
            

              149
              
LINKFLAGSDEFS*=-Wl,-z,defs


              149
              
LINKFLAGSDEFS*=-Wl,-z,defs -Wl,--as-needed

            

        

          150
          
LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\'

          150
          
LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\'

        

        

          151
          
LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'

          151
          
LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'

        

        

          152
          
    #TODO: drop $ORIGIN once no URE executable is also shipped in OOo

          152
          
    #TODO: drop $ORIGIN once no URE executable is also shipped in OOo

        



(-)openoffice.org.orig/solenv/inc/unxlngx6.mk
      (-1 / +1 lines)




  

    
      
            Lines 154-160
          
      
      
        Link Here
      
    
  

        

          154
          
LINKC*=$(CC)

          154
          
LINKC*=$(CC)

        

        

          155
          

          155
          

        

        

          156
          
# default linker flags

          156
          
# default linker flags

        

          
            

              157
              
LINKFLAGSDEFS*=-Wl,-z,defs


              157
              
LINKFLAGSDEFS*=-Wl,-z,defs -Wl,--as-needed

            

        

          158
          
LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\'

          158
          
LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\'

        

        

          159
          
LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'

          159
          
LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'

        

        

          160
          
    #TODO: drop $ORIGIN once no URE executable is also shipped in OOo

          160
          
    #TODO: drop $ORIGIN once no URE executable is also shipped in OOo

        






  

  Return to issue 89511