applied_patches/0080-link-as-needed.diff

   1 Index: inc/unxlngi6.mk
   2 ===================================================================
   3 RCS file: /cvs/tools/solenv/inc/unxlngi6.mk,v
   4 retrieving revision 1.45
   5 diff -u -r1.45 unxlngi6.mk
   6 --- solenv/inc/unxlngi6.mk      10 Apr 2008 17:49:25 -0000      1.45
   7 +++ solenv/inc/unxlngi6.mk      15 May 2008 13:29:59 -0000
   8 @@ -146,7 +146,7 @@
   9  LINKC*=$(CC)
  10
  11  # default linker flags
  12 -LINKFLAGSDEFS*=-Wl,-z,defs
  13 +LINKFLAGSDEFS*=-Wl,-z,defs -Wl,--as-needed
  14  LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\'
  15  LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'
  16      #TODO: drop $ORIGIN once no URE executable is also shipped in OOo
  17 Index: inc/unxlngx6.mk
  18 ===================================================================
  19 RCS file: /cvs/tools/solenv/inc/unxlngx6.mk,v
  20 retrieving revision 1.15
  21 diff -u -r1.15 unxlngx6.mk
  22 --- solenv/inc/unxlngx6.mk      10 Apr 2008 17:52:03 -0000      1.15
  23 +++ solenv/inc/unxlngx6.mk      15 May 2008 13:30:00 -0000
  24 @@ -154,7 +154,7 @@
  25  LINKC*=$(CC)
  26
  27  # default linker flags
  28 -LINKFLAGSDEFS*=-Wl,-z,defs
  29 +LINKFLAGSDEFS*=-Wl,-z,defs -Wl,--as-needed
  30  LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\'
  31  LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'
  32      #TODO: drop $ORIGIN once no URE executable is also shipped in OOo
  33 --- unodevtools/source/skeletonmaker/makefile.mk        11 Apr 2008 12:33:12 -0000      1.5
  34 +++ unodevtools/source/skeletonmaker/makefile.mk        22 May 2008 15:46:32 -0000
  35 @@ -51,8 +51,9 @@
  36
  37  APP1DEPN= $(OUT)$/lib$/$(UNODEVTOOLSLIBDEPN) $(SOLARLIBDIR)$/$(CODEMAKERLIBDEPN) \
  38         $(SOLARLIBDIR)$/$(COMMONCPPLIBDEPN) $(SOLARLIBDIR)$/$(COMMONJAVALIBDEPN)
  39 -APP1STDLIBS = $(REGLIB) $(SALLIB) $(SALHELPERLIB) $(CPPULIB) $(CPPUHELPERLIB) \
  40 -       $(UNODEVTOOLSLIBST) $(CODEMAKERLIBST) $(COMMONCPPLIBST) $(COMMONJAVALIBST)
  41 +APP1STDLIBS =\
  42 +       $(UNODEVTOOLSLIBST) $(CODEMAKERLIBST) $(COMMONCPPLIBST) $(COMMONJAVALIBST)\
  43 +       $(REGLIB) $(CPPULIB) $(CPPUHELPERLIB) $(SALHELPERLIB) $(SALLIB)
  44
  45  OBJFILES = $(APP1OBJS)
  46
  47 diff --git svx/util/makefile.mk svx/util/makefile.mk
  48 index 4598098..d5de0b6 100644
  49 --- svx/util/makefile.mk
  50 +++ svx/util/makefile.mk
  51 @@ -172,7 +172,6 @@ SHL2STDLIBS= \
  52              $(I18NISOLANGLIB) \
  53                         $(COMPHELPERLIB) \
  54                         $(UCBHELPERLIB) \
  55 -                       $(CPPUHELPERLIB)        \
  56                         $(CPPULIB) \
  57              $(VOSLIB) \
  58              $(SALLIB) \
  59 @@ -181,6 +181,7 @@
  60  .IF "$(GUI)"=="WNT"
  61  SHL2STDLIBS+= \
  62               $(SHLWAPILIB) \
  63 +             $(CPPUHELPERLIB) \
  64               $(ADVAPI32LIB)
  65  .ENDIF # WNT
  66