mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CWS-TOOLING: integrate CWS sb107

Browse Source 
2009-04-14 13:09:13 +0200 sb  r270758 : CWS-TOOLING: rebase CWS sb107 to trunk@270723 (milestone: DEV300:m46)
2009-04-06 14:11:54 +0200 sb  r270545 : #i100884# improve pagein effectiveness: wrap system libs in --as-needed on unxlngi6/unxlngx6 to avoid needing them where unneeded; link pagein as C program to avoid unneeded C++ runtime dependency; reorder pagein and javaldx in soffice startup script so that javaldx benefits from pagein
2009-03-31 16:40:23 +0200 sb  r270287 : decrease collisions in hashCode computation
2009-03-30 11:48:39 +0200 sb  r270207 : #i100668# corrected explicit template instantiation
2009-03-26 14:16:26 +0100 sb  r270078 : #i100408# inadvertently dropped libexslt dynamic library in previous rev 269789
2009-03-26 10:52:51 +0100 sb  r270058 : #i100576# fixed erroneous modification of RPM in previous rev 270057
2009-03-26 10:46:36 +0100 sb  r270057 : #i100576# Enable HAVE_LD_HASH_STYLE in sdev300.ini for unxlgni6 and unxlngx6; corrected unxlngx6.mk so that HAVE_LD_HASH_STYLE actually has an effect on ultimate LINKFLAGS value.
2009-03-25 16:53:39 +0100 sb  r270038 : #i85679# applied speed-symbolic-functions.diff provided by pmladek; re-ran autoconf; enabled HAVE_LD_BSYMBOLIC_FUNCTIONS for unxlngi6 and unxlngx6 in sdev300.ini
2009-03-25 15:29:12 +0100 sb  r270031 : #i100408# missing fixes in addition to -c 269789 (to actually only put single instances of certain libraries into installation sets)
2009-03-25 15:17:10 +0100 sb  r270029 : #i10084# revert masterfix additions of libraries to APPnSTDLIBs (during -r269000:269199) and instead use -rpath-link to avoid linker warnings on unxlngi6 and unxlngx6
2009-03-25 14:15:23 +0100 sb  r270023 : added svn:ignore
2009-03-25 10:25:08 +0100 sb  r270002 : #i10000# copied over trunk -c 269820
2009-03-23 10:16:00 +0100 sb  r269858 : CWS-TOOLING: rebase CWS sb107 to trunk@269781 (milestone: DEV300:m44)
2009-03-20 11:22:27 +0100 sb  r269789 : #i100408# reduce (multiple copies of) libraries delivered to solver; for that to work fine, deliver symlink feature got improved to only create a symlink if the original file exists
2009-03-20 09:21:32 +0100 sb  r269782 : #i100396# replace s(HTML|RTF)_xxx declarations with OOO_STRING_SVTOOLS_(HTML|RTF)_xxx macros to reduce symbolic relocations at load time (at least on ELF systems).
2009-03-19 11:34:56 +0100 sb  r269734 : #i100348# added VISIBILITY_HIDDEN=TRUE so that symbols from the resulting archive are not erroneously exported from dynamic libraries including the archive
2009-03-19 11:32:20 +0100 sb  r269733 : #i100348# as a prerequisite for following changes, brought jpeg-6b.patch into "dmake create_patch" format and removed application/octet-stream svn:mime-type
2009-03-12 10:39:08 +0100 sb  r269370 : duplicated cws/odfmetadata2/solenv/inc/target.mk -c 268831
2009-03-04 17:25:16 +0100 sb  r268849 : #i99880# missing AUGMENT_LIBRARY_PATH
2009-02-25 17:54:34 +0100 sb  r268459 : CWS-TOOLING: rebase CWS sb107 to trunk@268395 (milestone: DEV300:m42)
2009-02-25 09:23:15 +0100 sb  r268413 : #i99584# avoid undefined operations on nOffset (patch by cmc)
2009-02-23 10:02:25 +0100 sb  r268344 : #i99519 removed unnecessary library dependencies
2009-02-18 17:54:24 +0100 sb  r268250 : avoid warnings about format specifier and argument mismatch (on 64bit debug builds)
2009-02-18 17:50:34 +0100 sb  r268249 : avoid erroneous warning that control reaches end of non-void function
2009-02-18 17:33:53 +0100 sb  r268248 : sdext/source/pdfimport/misc/pdfihelper.cxx: #include <vcl/canvastools.hxx>
This commit is contained in:
Ivo Hinkelmann 2009-04-27 11:24:10 +00:00
parent 79c77cb599
commit a6ef6eddc6
15 changed files with 7614 additions and 7262 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14632
configure vendored
View File

File diff suppressed because it is too large Load Diff

19
configure.in
View File

@ -1450,6 +1450,25 @@ if test \( "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes" \) -a "$GCC" = "yes"; th
fi
AC_SUBST(GCCVER)
HAVE_LD_BSYMBOLIC_FUNCTIONS=
if test "$GCC" = "yes"; then
AC_MSG_CHECKING( for -Bsymbolic-functions linker support )
bsymbolic_functions_ldflags_save=$LDFLAGS
LDFLAGS="$LDFLAGS -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo"
AC_LINK_IFELSE([AC_LANG_PROGRAM([
#include <stdio.h>
],[
printf ("hello world\n");
])], HAVE_LD_BSYMBOLIC_FUNCTIONS=TRUE, [])
if test "z$HAVE_LD_BSYMBOLIC_FUNCTIONS" = "zTRUE"; then
AC_MSG_RESULT( found )
else
AC_MSG_RESULT( not found )
fi
LDFLAGS=$bsymbolic_functions_ldflags_save
fi
AC_SUBST(HAVE_LD_BSYMBOLIC_FUNCTIONS)
dnl ===================================================================
dnl Set the ENABLE_PCH variable. (Activate --enable-pch)
dnl ===================================================================

4
scp2/inc/macros.inc
View File

@ -23,10 +23,6 @@
#define DOCONCAT9( x, y, z, a, b, c, u, v, w) x##y##z##a##b##c##u##v##w
#define CONCAT9( x, y, z, a, b, c, u, v, w) DOCONCAT9(x,y,z,a,b,c,u,v,w)
#define CURL_MAJOR 3
#define CURL_MINOR 0
#define CURL_MICRO 0
#define MOD_NAME_DESC(id) \
ALL_LANG(Name,STR_NAME_##id); \
ALL_LANG(Description,STR_DESC_##id)

18
scp2/source/ooo/file_library_ooo.scp
View File

@ -210,7 +210,7 @@ File gid_File_Lib_Curl
#ifdef MACOSX
Name = STRING(CONCAT2(libcurl.3,UNXSUFFIX));
#else
Name = STRING(CONCAT8(libcurl,UNXSUFFIX,.,CURL_MAJOR,.,CURL_MINOR,.,CURL_MICRO));
Name = STRING(CONCAT3(libcurl,UNXSUFFIX,.3));
#endif
#else
#ifdef _gcc3
@ -1534,9 +1534,9 @@ File gid_File_Lib_Xslt
Dir = gid_Dir_Program;
#ifdef UNX
#ifdef MACOSX
Name = STRING(CONCAT8(libxslt,.,LIBXSLT_MAJOR,.,LIBXSLT_MINOR,.,LIBXSLT_MICRO,UNXSUFFIX));
Name = STRING(CONCAT4(libxslt,.,LIBXSLT_MAJOR,UNXSUFFIX));
#else
Name = STRING(CONCAT8(libxslt,UNXSUFFIX,.,LIBXSLT_MAJOR,.,LIBXSLT_MINOR,.,LIBXSLT_MICRO));
Name = STRING(CONCAT4(libxslt,UNXSUFFIX,.,LIBXSLT_MAJOR));
#endif
#else
#ifdef _gcc3
@ -1730,9 +1730,9 @@ File gid_File_Lib_Raptor
Dir = gid_Dir_Program;
#ifdef UNX
#ifdef MACOSX
Name = STRING(CONCAT8(libraptor,.,RAPTOR_MAJOR,.,RAPTOR_MINOR,.,RAPTOR_MICRO,UNXSUFFIX));
Name = STRING(CONCAT4(libraptor,.,RAPTOR_MAJOR,UNXSUFFIX));
#else
Name = STRING(CONCAT8(libraptor,UNXSUFFIX,.,RAPTOR_MAJOR,.,RAPTOR_MINOR,.,RAPTOR_MICRO));
Name = STRING(CONCAT4(libraptor,UNXSUFFIX,.,RAPTOR_MAJOR));
#endif
#else
#ifdef _gcc3
@ -1749,9 +1749,9 @@ File gid_File_Lib_Rasqal
Dir = gid_Dir_Program;
#ifdef UNX
#ifdef MACOSX
Name = STRING(CONCAT8(librasqal,.,RASQAL_MAJOR,.,RASQAL_MINOR,.,RASQAL_MICRO,UNXSUFFIX));
Name = STRING(CONCAT4(librasqal,.,RASQAL_MAJOR,UNXSUFFIX));
#else
Name = STRING(CONCAT8(librasqal,UNXSUFFIX,.,RASQAL_MAJOR,.,RASQAL_MINOR,.,RASQAL_MICRO));
Name = STRING(CONCAT4(librasqal,UNXSUFFIX,.,RASQAL_MAJOR));
#endif
#else
#ifdef _gcc3
@ -1768,9 +1768,9 @@ File gid_File_Lib_Rdf
Dir = gid_Dir_Program;
#ifdef UNX
#ifdef MACOSX
Name = STRING(CONCAT8(librdf,.,REDLAND_MAJOR,.,REDLAND_MINOR,.,REDLAND_MICRO,UNXSUFFIX));
Name = STRING(CONCAT4(librdf,.,REDLAND_MAJOR,UNXSUFFIX));
#else
Name = STRING(CONCAT8(librdf,UNXSUFFIX,.,REDLAND_MAJOR,.,REDLAND_MINOR,.,REDLAND_MICRO));
Name = STRING(CONCAT4(librdf,UNXSUFFIX,.,REDLAND_MAJOR));
#endif
#else
#ifdef _gcc3

13
scp2/source/ooo/makefile.mk
View File

@ -111,10 +111,7 @@ SCPDEFS+=-DSYSTEM_LIBXML
SCPDEFS+=-DSYSTEM_LIBXSLT
.ELSE
.INCLUDE : libxsltversion.mk
SCPDEFS+=\
-DLIBXSLT_MAJOR=$(LIBXSLT_MAJOR) \
-DLIBXSLT_MINOR=$(LIBXSLT_MINOR) \
-DLIBXSLT_MICRO=$(LIBXSLT_MICRO)
SCPDEFS+=-DLIBXSLT_MAJOR=$(LIBXSLT_MAJOR)
.ENDIF
.IF "$(SYSTEM_DB)" == "YES"
@ -167,14 +164,8 @@ SCPDEFS+=-DSYSTEM_REDLAND
.INCLUDE : redlandversion.mk
SCPDEFS+=\
-DRAPTOR_MAJOR=$(RAPTOR_MAJOR) \
-DRAPTOR_MINOR=$(RAPTOR_MINOR) \
-DRAPTOR_MICRO=$(RAPTOR_MICRO) \
-DRASQAL_MAJOR=$(RASQAL_MAJOR) \
-DRASQAL_MINOR=$(RASQAL_MINOR) \
-DRASQAL_MICRO=$(RASQAL_MICRO) \
-DREDLAND_MAJOR=$(REDLAND_MAJOR) \
-DREDLAND_MINOR=$(REDLAND_MINOR) \
-DREDLAND_MICRO=$(REDLAND_MICRO)
-DREDLAND_MAJOR=$(REDLAND_MAJOR)
.ENDIF
.IF "$(SYSTEM_BSH)" == "YES"

123
scp2/source/ooo/shortcut_ooo.scp
View File

@ -30,60 +30,6 @@
#include "macros.inc"
#ifndef SYSTEM_LIBXSLT
#ifdef UNX
Shortcut gid_Shortcut_Lib_Xslt
FileID = gid_File_Lib_Xslt;
Dir = gid_Dir_Program;
#ifdef MACOSX
Name = STRING(CONCAT4(libxslt,.,LIBXSLT_MAJOR,UNXSUFFIX));
#else
Name = STRING(CONCAT4(libxslt,UNXSUFFIX,.,LIBXSLT_MAJOR));
#endif
Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
End
#endif
#ifdef UNX
Shortcut gid_Shortcut_Lib_Xslt_2
ShortcutID = gid_Shortcut_Lib_Xslt;
Dir = gid_Dir_Program;
Name = STRING(CONCAT2(libxslt,UNXSUFFIX));
Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
End
#endif
#endif
#ifndef SYSTEM_CURL
#ifdef UNX
Shortcut gid_Shortcut_Lib_Curl_0
FileID = gid_File_Lib_Curl;
Dir = gid_Dir_Program;
Name = STRING(CONCAT2(libcurl,UNXSUFFIX));
Styles = (NETWORK,RELATIVE);
End
#endif
#ifdef UNX
Shortcut gid_Shortcut_Lib_Curl_1
FileID = gid_File_Lib_Curl;
Dir = gid_Dir_Program;
Name = STRING(CONCAT4(libcurl,UNXSUFFIX,.,CURL_MAJOR));
Styles = (NETWORK,RELATIVE);
End
#endif
#endif
#ifdef UNX
#ifndef SYSTEM_ICU
@ -130,72 +76,3 @@ End
#endif
//i44154 -end-
#ifndef SYSTEM_REDLAND
#ifdef UNX
Shortcut gid_Shortcut_Lib_Raptor_1
FileID = gid_File_Lib_Raptor;
Dir = gid_Dir_Program;
#ifdef MACOSX
Name = STRING(CONCAT4(libraptor,.,RAPTOR_MAJOR,UNXSUFFIX));
#else
Name = STRING(CONCAT4(libraptor,UNXSUFFIX,.,RAPTOR_MAJOR));
#endif
Styles = (RELATIVE);
End
#endif
#ifdef UNX
Shortcut gid_Shortcut_Lib_Raptor_2
ShortcutID = gid_Shortcut_Lib_Raptor_1;
Dir = gid_Dir_Program;
Name = STRING(CONCAT2(libraptor,UNXSUFFIX));
Styles = (RELATIVE);
End
#endif
#ifdef UNX
Shortcut gid_Shortcut_Lib_Rasqal_1
FileID = gid_File_Lib_Rasqal;
Dir = gid_Dir_Program;
#ifdef MACOSX
Name = STRING(CONCAT4(librasqal,.,RASQAL_MAJOR,UNXSUFFIX));
#else
Name = STRING(CONCAT4(librasqal,UNXSUFFIX,.,RASQAL_MAJOR));
#endif
Styles = (RELATIVE);
End
#endif
#ifdef UNX
Shortcut gid_Shortcut_Lib_Rasqal_2
ShortcutID = gid_Shortcut_Lib_Rasqal_1;
Dir = gid_Dir_Program;
Name = STRING(CONCAT2(librasqal,UNXSUFFIX));
Styles = (RELATIVE);
End
#endif
#ifdef UNX
Shortcut gid_Shortcut_Lib_Rdf_1
FileID = gid_File_Lib_Rdf;
Dir = gid_Dir_Program;
#ifdef MACOSX
Name = STRING(CONCAT4(librdf,.,REDLAND_MAJOR,UNXSUFFIX));
#else
Name = STRING(CONCAT4(librdf,UNXSUFFIX,.,REDLAND_MAJOR));
#endif
Styles = (RELATIVE);
End
#endif
#ifdef UNX
Shortcut gid_Shortcut_Lib_Rdf_2
ShortcutID = gid_Shortcut_Lib_Rdf_1;
Dir = gid_Dir_Program;
Name = STRING(CONCAT2(librdf,UNXSUFFIX));
Styles = (RELATIVE);
End
#endif
#endif // SYSTEM_REDLAND

2
set_soenv.in
View File

@ -1799,6 +1799,8 @@ ToFile( "CC", $CC, "e" );
ToFile( "HAVE_GCC_VISIBILITY_FEATURE",
"@HAVE_GCC_VISIBILITY_FEATURE@", "e" );
ToFile( "HAVE_LD_HASH_STYLE","@HAVE_LD_HASH_STYLE@","e" );
ToFile( "HAVE_LD_BSYMBOLIC_FUNCTIONS",
"@HAVE_LD_BSYMBOLIC_FUNCTIONS@","e" );
ToFile( "CXX", $CXX, "e" );
ToFile( "MINGWCXX", "@MINGWCXX@", "e" );
ToFile( "MINGWSTRIP", "@MINGWSTRIP@", "e" );

3
soldep/source/makefile.mk
View File

@ -116,9 +116,6 @@ APP1STDLIBS= \
$(VOSLIB) \
$(SALLIB) \
$(CPPULIB) \
$(TKLIB) $(SVLLIB) $(UNOTOOLSLIB) $(I18NISOLANGLIB)\
$(I18NUTILLIB) $(UCBHELPERLIB) $(ICUUCLIB) $(ICUDATALIB) $(ICULELIB) \
$(JVMFWKLIB) $(SALHELPERLIB) $(BASEGFXLIB) \
$(PERL_LIB)
APP1LIBS=\

3
solenv/bin/deliver.pl
View File

@ -339,6 +339,7 @@ sub do_symlink
$line = expand_macros($line);
($from, $to) = split(' ',$line);
my $fullfrom = $from;
if ( dirname($from) eq dirname($to) ) {
$from = basename($from);
}
@ -369,7 +370,7 @@ sub do_symlink
push_on_ziplist($to) if $opt_zip;
return;
}
return unless -e $fullfrom;
print "SYMLIB: $from -> $to\n" if $opt_verbose;
if ( !symlink("$from", "$to") ) {
print_error("can't symlink $from -> $to: $!",0);

4
solenv/config/sdev300.ini
View File

@ -650,6 +650,8 @@ unxlngi6
DELIVER %PERL% %SOLARENV%/bin/deliver.pl
DMAKEROOT %SOLARENV%/inc/startup
HAVE_GCC_VISIBILITY_FEATURE TRUE
HAVE_LD_BSYMBOLIC_FUNCTIONS TRUE
HAVE_LD_HASH_STYLE TRUE
LIBRARY_PATH %SYSBASE%/usr/lib
MKOUT %PERL% %SOLARENV%/bin/mkout.pl
PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11
@ -972,6 +974,8 @@ unxlngx6
DELIVER %PERL% %SOLARENV%/bin/deliver.pl
DMAKEROOT %SOLARENV%/inc/startup
HAVE_GCC_VISIBILITY_FEATURE TRUE
HAVE_LD_BSYMBOLIC_FUNCTIONS TRUE
HAVE_LD_HASH_STYLE TRUE
LIBRARY_PATH %SYSBASE%/usr/lib
MKOUT %PERL% %SOLARENV%/bin/mkout.pl
PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11

2
solenv/inc/target.mk
View File

@ -226,7 +226,7 @@ NEWCLASS+=$(CLASSGENDIR)
.ENDIF # "$(GENJAVACLASSFILES)"!=""
.IF "$(NEWCLASS)"!=""
# See iz36027 for the reason for the strange $(subst ..) construct
CLASSPATH:=.$(PATH_SEPERATOR)$(CLASSDIR)$(PATH_SEPERATOR)$(XCLASSPATH)$(PATH_SEPERATOR){$(subst,%Z*Z%,$(PATH_SEPERATOR) $(NEWCLASS:s/ /%Z*Z%/))}
CLASSPATH:=.$(PATH_SEPERATOR)$(CLASSDIR)$(PATH_SEPERATOR)$(XCLASSPATH)$(PATH_SEPERATOR){$(subst,%Z*Z%,$(PATH_SEPERATOR) $(NEWCLASS:s/ /%Z*Z%/))}$(PATH_SEPERATOR)$(SOLARLIBDIR)
.ENDIF # "$(NEWCLASS)"!=""
.ENDIF # "$(L10N_framework)"==""

17
solenv/inc/unxlngi6.mk
View File

@ -157,10 +157,15 @@ LINKFLAGSRUNPATH_OXT=
LINKFLAGSRUNPATH_NONE=
# flag -Wl,-z,noexecstack sets the NX bit on the stack
LINKFLAGS=-Wl,-z,noexecstack -Wl,-z,combreloc $(LINKFLAGSDEFS)
.IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)" == "TRUE"
LINKFLAGS += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo
.ENDIF
# linker flags for linking applications
LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \
-Wl,-rpath-link,$(LB):$(SOLARLIBDIR)
LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \
-Wl,-rpath-link,$(LB):$(SOLARLIBDIR)
# linker flags for linking shared libraries
LINKFLAGSSHLGUI= -shared
@ -202,11 +207,11 @@ LINKFLAGS += -Wl,-zdynsort
.ENDIF
# libraries for linking applications
STDLIBGUIMT+=-lX11 -ldl -lpthread -lm
STDLIBCUIMT+=-ldl -lpthread -lm
STDLIBGUIMT+=-Wl,--as-needed -lX11 -ldl -lpthread -lm -Wl,--no-as-needed
STDLIBCUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed
# libraries for linking shared libraries
STDSHLGUIMT+=-lX11 -lXext -ldl -lpthread -lm
STDSHLCUIMT+=-ldl -lpthread -lm
STDSHLGUIMT+=-Wl,--as-needed -lX11 -lXext -ldl -lpthread -lm -Wl,--no-as-needed
STDSHLCUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed
LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive

29
solenv/inc/unxlngx6.mk
View File

@ -77,12 +77,6 @@ CFLAGS+=-Wreturn-type -fmessage-length=0 -c
CFLAGSENABLESYMBOLS=-g1
.ELSE
CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
.ENDIF
.IF "$(HAVE_LD_HASH_STYLE)" == "TRUE"
LINKFLAGS += -Wl,--hash-style=both
.ELSE
LINKFLAGS += -Wl,-zdynsort
.ENDIF
# flags for the C++ Compiler
@ -162,10 +156,21 @@ LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$O
LINKFLAGSRUNPATH_OXT=
LINKFLAGSRUNPATH_NONE=
LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)
.IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)" == "TRUE"
LINKFLAGS += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo
.ENDIF
.IF "$(HAVE_LD_HASH_STYLE)" == "TRUE"
LINKFLAGS += -Wl,--hash-style=both
.ELSE
LINKFLAGS += -Wl,-zdynsort
.ENDIF
# linker flags for linking applications
LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \
-Wl,-rpath-link,$(LB):$(SOLARLIBDIR)
LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \
-Wl,-rpath-link,$(LB):$(SOLARLIBDIR)
# linker flags for linking shared libraries
LINKFLAGSSHLGUI= -shared
@ -195,11 +200,11 @@ STDOBJCUI=
STDSLOCUI=
# libraries for linking applications
STDLIBGUIMT+=-lX11 -ldl -lpthread -lm
STDLIBCUIMT+=-ldl -lpthread -lm
STDLIBGUIMT+=-Wl,--as-needed -lX11 -ldl -lpthread -lm -Wl,--no-as-needed
STDLIBCUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed
# libraries for linking shared libraries
STDSHLGUIMT+=-lX11 -lXext -ldl -lpthread -lm
STDSHLCUIMT+=-ldl -lpthread -lm
STDSHLGUIMT+=-Wl,--as-needed -lX11 -lXext -ldl -lpthread -lm -Wl,--no-as-needed
STDSHLCUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed
LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive

4
stlport/makefile.mk
View File

@ -151,6 +151,10 @@ BUILD_FLAGS=-f vc7.mak EXFLAGS="/EHa /Zc:wchar_t-" CCNUMVER=$(CCNUMVER)
CXX+= -Wl,--hash-style=both
.ENDIF
.IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)" == "TRUE"
CXX+= -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo
.ENDIF
.IF "$(COM)"=="C52"
BUILD_ACTION=make
.IF "$(CCNUMVER)">="00050008"

3
stlport/prj/d.lst
View File

@ -17,9 +17,8 @@ mkdir: %_DEST%\inc%_EXT%\stl\wrap_std\h
..\%__SRC%\inc\stlport\using\h\* %_DEST%\inc%_EXT%\stl\using\h\*
..\%__SRC%\inc\stlport\wrap_std\* %_DEST%\inc%_EXT%\stl\wrap_std\*
..\%__SRC%\inc\stlport\wrap_std\h\* %_DEST%\inc%_EXT%\stl\wrap_std\h\*
..\%__SRC%\lib\lib*.so* %_DEST%\lib%_EXT%\lib*.so*
..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%\lib*.a
..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%\lib*.dylib
..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib
..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll