Skip to content

C
core
Kaydet (Commit) 589f7ed2 authored tarafından Norbert Thiebaud's avatar Norbert Thiebaud
Dosyalara gözat
Seçenekler

Merge remote branch 'origin/feature/gnumake2.1' into integration/dev300_m101 

* origin/feature/gnumake2.1: (202 commits)
  Revert "starmath need to have _DLL_ defined, even on MacOS"
  tweak library name on MacOS
  starmath need to have _DLL_ defined, even on MacOS
  add helper to set-up the libraries env, to run executable during build
  the startmath module in Module_ooo must use the name of the directory
  add starmath libraries to Repository.mk
  make linkoo scan the solver too, for Norbert's gnumake work
  -Wunitialized is not compatible with -DDEBUG
  rename gb_HIRESTIME to gb_LOWRESTIME. Assume highres precision by default
  add missing library for sc.  Massage the delivered libraries name.
  support USE_GMAKE=1 envvar to build with gmake the modules that can be.
  add sc in the list of gmake-Modules
  support for an alternate gbuild.lst to support gmake build
  add a few comment to balance quotes, to make the editor less confused
  add all the sub-directory of the RESLOCATION to search for resource
  add calc related library to the Repository
  tweak MacOs platform specific include to build on Macos
  fixing variable exports for windows compiler (thanks ause)
  fixing variable exports for windows compiler (thanks ause)
  also accept debug=t
  ...

Conflicts:
	Makefile.in
	Module_ooo.mk
	Repository.mk
	RepositoryFixes.mk
	configure.in
	solenv/bin/build.pl
	solenv/bin/modules/RepositoryHelper.pm
	solenv/bin/packmodule
	solenv/doc/gbuild/doxygen.cfg
	solenv/doc/gbuild/solenv/gbuild/types.mk
	solenv/gbuild/AllLangResTarget.mk
	solenv/gbuild/BuildDirs.mk
	solenv/gbuild/ComponentTarget.mk
	solenv/gbuild/Deliver.mk
	solenv/gbuild/Executable.mk
	solenv/gbuild/Helper.mk
	solenv/gbuild/Library.mk
	solenv/gbuild/LinkTarget.mk
	solenv/gbuild/Module.mk
	solenv/gbuild/Output.mk
	solenv/gbuild/Package.mk
	solenv/gbuild/PrecompiledHeaders.mk
	solenv/gbuild/SdiTarget.mk
	solenv/gbuild/StaticLibrary.mk
	solenv/gbuild/TargetLocations.mk
	solenv/gbuild/gbuild.mk
	solenv/gbuild/platform/linux.mk
	solenv/gbuild/platform/macosx.mk
	solenv/gbuild/platform/solaris.mk
	solenv/gbuild/platform/windows.mk
	solenv/gbuild/processdelivered.awk
	solenv/gbuild/processdeps.awk
	solenv/inc/unxgcc.mk
	soltools/mkdepend/def.h
	soltools/mkdepend/include.c
üst f0e5895d b608b4df
Hide whitespace changes
Inline Side-by-side
Showing with 120 additions and 66 deletions
.gitignore
Dosyayı görüntüle @ 589f7ed2
......@@ -76,6 +76,7 @@
/bean
/beanshell
/berkeleydb
/binaryurp
/binfilter
/boost
/bridges
......
Makefile.in
Dosyayı görüntüle @ 589f7ed2
......@@ -2,40 +2,48 @@
SHELL=/usr/bin/env bash
ifeq ($(USE_GMAKE),)
GBUILD_OPT:=
else
GBUILD_OPT:=--gmake
endif
all: Makefile dmake/dmake@EXEEXT@ src.downloaded
. ./*[Ee]nv.[Ss]et.sh && \
@. ./*[Ee]nv.[Ss]et.sh && \
cd instsetoo_native && \
build.pl -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@
build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@
install:
@echo "Installing in $${prefix:-/usr/local}..."
. ./*[Ee]nv.[Ss]et.sh && \
ooinstall "$${prefix:-@prefix@}"
@echo && \
@. ./*[Ee]nv.[Ss]et.sh && \
echo "Installing in $${prefix:-@prefix@}..." && \
ooinstall "$${prefix:-@prefix@}" && \
echo "" && \
echo "Installation finished, you can now execute:" && \
echo "$${prefix:-@prefix@}/program/soffice"
dev-install:
. ./*[Ee]nv.[Ss]et.sh && \
ooinstall -l @abs_builddir@/install
@echo && \
@. ./*[Ee]nv.[Ss]et.sh && \
ooinstall -l @abs_builddir@/install && \
echo "" && \
echo "Developer installation finished, you can now execute:" && \
echo "@abs_builddir@/install/program/soffice"
distclean: dmake/dmake@EXEEXT@
. ./*[Ee]nv.[Ss]et.sh && \
@. ./*[Ee]nv.[Ss]et.sh && \
dmake distclean
clean: dmake/dmake@EXEEXT@
. ./*[Ee]nv.[Ss]et.sh && \
dmake clean
@. ./*[Ee]nv.[Ss]et.sh && \
dmake clean && \
if [ -n "$$USE_GMAKE" ] ; then make -f GNUmakefile.mk -sr clean ; fi
dmake/dmake@EXEEXT@:
. ./*[Ee]nv.[Ss]et.sh && \
@. ./*[Ee]nv.[Ss]et.sh && \
./bootstrap
src.downloaded: ooo.lst download
. ./*[Ee]nv.[Ss]et.sh && \
@. ./*[Ee]nv.[Ss]et.sh && \
$$SRC_ROOT/download $$SRC_ROOT/ooo.lst && touch $@
fetch: src.downloaded
......@@ -44,19 +52,19 @@ Makefile: configure.in set_soenv.in Makefile.in
./autogen.sh
check: Makefile dmake/dmake@EXEEXT@ fetch
. ./*[Ee]nv.[Ss]et.sh && \
@. ./*[Ee]nv.[Ss]et.sh && \
cd smoketestoo_native && \
export SAL_USE_VCLPLUGIN="svp" && \
build.pl -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@
build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@
id:
. ./*[Ee]nv.[Ss]et.sh && \
@. ./*[Ee]nv.[Ss]et.sh && \
create-ids
tags:
. ./*[Ee]nv.[Ss]et.sh && \
@. ./*[Ee]nv.[Ss]et.sh && \
create-tags
docs:
. ./*[Ee]nv.[Ss]et.sh && \
@. ./*[Ee]nv.[Ss]et.sh && \
mkdocs.sh $$SRC_ROOT/docs $$SOLARENV/inc/doxygen.cfg
Module_ooo.mk
Dosyayı görüntüle @ 589f7ed2
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
#
# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
......@@ -14,12 +14,12 @@
#
# OpenOffice.org is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License version 3 for more details
# (a copy is included in the LICENSE file that accompanied this code).
#
# You should have received a copy of the GNU Lesser General Public License
# version 3 along with OpenOffice.org. If not, see
# version 3 along with OpenOffice.org. If not, see
# <http://www.openoffice.org/license.html>
# for a copy of the LGPLv3 License.
#
......@@ -29,7 +29,7 @@ $(eval $(call gb_Module_Module,ooo))
$(eval $(call gb_Module_add_moduledirs,ooo,\
comphelper \
editeng \
editeng \
framework \
padmin \
sfx2 \
......
Repository.mk
Dosyayı görüntüle @ 589f7ed2
......@@ -48,7 +48,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
cui \
drawinglayer \
editeng \
eggtray \
fwe \
fwi \
fwk \
......@@ -58,6 +57,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
lng \
msfilter \
msword \
oox \
qstart_gtk \
sax \
sb \
......@@ -97,7 +97,6 @@ $(eval $(call gb_Helper_register_libraries,RTLIBS, \
i18nisolang1 \
i18nutil \
ucbhelper \
vos3 \
))
$(eval $(call gb_Helper_register_libraries,RTVERLIBS, \
......@@ -131,7 +130,6 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
salcpprt \
vclmain \
zlib \
vclmain \
))
# vim: set noet sw=4 ts=4:
configure.in
Dosyayı görüntüle @ 589f7ed2
......@@ -1984,7 +1984,7 @@ AC_MSG_CHECKING([the GNU make version])
_make_version=`$GNUMAKE --version | grep GNU | $SED -e 's@^[[^0-9]]*@@' -e 's@ .*@@' -e 's@,.*@@'`;
_make_longver=`echo $_make_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
if test "$_make_longver" -ge "038100" ; then
AC_MSG_RESULT([$GNUMAKE $_make_version])
AC_MSG_RESULT([$GNUMAKE $_make_version])
else
AC_MSG_ERROR([failed ($GNUMAKE version >= 3.81 needed])
fi
......
git-hooks/pre-commit
Dosyayı görüntüle @ 589f7ed2
......@@ -20,8 +20,8 @@ sub fix_whitespace($$) {
# usually we have nothing to do ;-)
return if ( keys( %{$lines} ) == 0 ||
$file eq "" ||
!( $file =~ /\.(c|cpp|cxx|h|hrc|hxx|idl|inl|java|map|mk|MK|pl|pm|pmk|py|sdi|sh|src|tab)/ ) );
$file eq "" || $file eq "GNUmakefile" ||
!( $file =~ /\.(c|cpp|cxx|h|hrc|hxx|idl|inl|java|map|MK|pl|pm|pmk|py|sdi|sh|src|tab)/ ) );
open( IN, "$file" ) || die "Cannot open $file for reading";
my ( $out, $tmpfile ) = mkstemp( "/tmp/whitespace-fixing-XXXXXX" );
......@@ -157,7 +157,8 @@ my $err_ext = "";
open( FILES, "git diff-index --cached --name-only $against |" ) || die "Cannot run git diff-index.";
while ( my $file = <FILES> ) {
chomp( $file );
if ( $file =~ /\.(c|cpp|cxx|h|hrc|hxx|idl|inl|java|map|mk|MK|pmk|pl|pm|sdi|sh|src|tab|xcu|xml)$/) {
if ( $file ne "GNUmakefile" &&
$file =~ /\.(c|cpp|cxx|h|hrc|hxx|idl|inl|java|map|MK|pmk|pl|pm|sdi|sh|src|tab|xcu|xml)$/) {
open( F, "git diff-index -p --cached $against -- '$file' |" );
while ( my $line = <F> ) {
if ( $line =~ /^\+ *\t/ ) {
......
solenv/bin/build.pl
Dosyayı görüntüle @ 589f7ed2
......@@ -141,7 +141,7 @@
my %platforms = (); # platforms available or being working with
my %platforms_to_copy = (); # copy output trees for the platforms when --prepare
my $tmp_dir = get_tmp_dir(); # temp directory for checkout and other actions
my @possible_build_lists = ('build.lst', 'build.xlist'); # build lists names
my @possible_build_lists = ('gbuild.lst', 'build.lst', 'build.xlist'); # build lists names
my %build_list_paths = (); # build lists names
my %build_lists_hash = (); # hash of arrays $build_lists_hash{$module} = \($path, $xml_list_object)
my $pre_job = 'announce'; # job to add for not-single module build
......@@ -199,6 +199,8 @@
my $zenity_in = '';
my $zenity_out = '';
my $zenity_err = '';
my $allow_gbuild = 0;
my %is_gbuild = ();
my $verbose = 0;
my @modules_built = ();
......@@ -540,10 +542,17 @@ sub get_build_list_path {
my $possible_dir_path = $module_paths{$_}.'/prj/';
if (-d $possible_dir_path) {
foreach my $build_list (@possible_build_lists) {
my $possible_build_list_path = correct_path($possible_dir_path . $build_list);
if (-f $possible_build_list_path) {
$build_list_paths{$module} = $possible_build_list_path;
return $possible_build_list_path;
# if gbuild are allow we favor gbuild.lst as the build instruction
if($build_list ne "gbuild.lst" || $allow_gbuild) {
my $possible_build_list_path = correct_path($possible_dir_path . $build_list);
if (-f $possible_build_list_path) {
$build_list_paths{$module} = $possible_build_list_path;
if ($build_list eq "gbuild.lst") {
# print "Using gmake for module $module\n";
$is_gbuild{$module} = 1;
};
return $possible_build_list_path;
};
};
}
print_error("There's no build list for $module");
......@@ -876,7 +885,7 @@ sub get_prj_platform {
s/\r\n//;
$line++;
if ($_ =~ /\snmake\s/) {
if ($' =~ /\s*-\s+(\w+)[,\S+]*\s+(\S+)/ ) {
if ($' =~ /\s*-\s+(\w+)[,\S+]*\s+(\S+)/ ) { #'
my $platform = $1;
my $alias = $2;
print_error ("There is no correct alias set in the line $line!") if ($alias eq 'NULL');
......@@ -968,7 +977,7 @@ sub get_deps_hash {
$platform = $1;
$dependencies = $';
while ($dependencies =~ /,(\w+)/o) {
$dependencies = $';
$dependencies = $'; #'
};
$dependencies =~ /\s+(\S+)\s+/o;
$dir_alias = $1;
......@@ -980,7 +989,7 @@ sub get_deps_hash {
delete $dead_dependencies{$dir_alias} if (defined $dead_dependencies{$dir_alias});
print_error("Directory alias $dir_alias is defined at least twice!! Please, correct build.lst in module $module_to_build") if (defined $$dependencies_hash{$dir_alias});
$platform_hash{$dir_alias}++;
$dependencies = $';
$dependencies = $'; #'
print_error("$module_to_build/prj/build.lst has wrongly written dependencies string:\n$_\n") if (!$dependencies);
$deps_hash{$_}++ foreach (get_dependency_array($dependencies));
$$dependencies_hash{$dir_alias} = \%deps_hash;
......@@ -1347,7 +1356,7 @@ sub get_dependency_array {
print_error("Project $prj has wrongly written dependencies string:\n $string") if (!$dep_string);
$dep_string =~ /(\S+)\s*/o;
$parent_prj = $1;
$dep_string = $';
$dep_string = $'; #'
if ($parent_prj =~ /\.(\w+)$/o) {
$parent_prj = $`;
if (($prj_platform{$parent_prj} ne $1) &&
......@@ -1467,9 +1476,10 @@ sub get_options {
$arg =~ /^--checkmodules$/ and $checkparents = 1 and $ignore = 1 and next;
$arg =~ /^-s$/ and $show = 1 and next;
$arg =~ /^--deliver$/ and $deliver = 1 and next;
$arg =~ /^--gmake$/ and $allow_gbuild = 1 and print "ALLOW GBUILD" and next;
$arg =~ /^(--job=)/ and $custom_job = $' and next;
$arg =~ /^(--pre_job=)/ and $pre_custom_job = $' and next;
$arg =~ /^(--post_job=)/ and $post_custom_job = $' and next;
$arg =~ /^(--post_job=)/ and $post_custom_job = $' and next; #'
$arg =~ /^-d$/ and $deliver = 1 and next;
$arg =~ /^--dlv_switch$/ and $dlv_switch = shift @ARGV and next;
$arg =~ /^--file$/ and $cmd_file = shift @ARGV and next;
......@@ -1618,11 +1628,12 @@ sub get_module_and_buildlist_paths {
$source_config_file = $source_config->get_config_file_path();
$active_modules{$_}++ foreach ($source_config->get_active_modules());
my %active_modules_copy = %active_modules;
foreach ($source_config->get_all_modules()) {
delete $active_modules_copy{$_} if defined($active_modules_copy{$_});
next if ($_ eq $initial_module);
$module_paths{$_} = $source_config->get_module_path($_);
$build_list_paths{$_} = $source_config->get_module_build_list($_)
foreach my $module ($source_config->get_all_modules()) {
delete $active_modules_copy{$module} if defined($active_modules_copy{$module});
next if ($module eq $initial_module);
$module_paths{$module} = $source_config->get_module_path($module);
$build_list_paths{$module} = $source_config->get_module_build_list($module);
$is_gbuild{$module} = $source_config->{GBUILD};
}
$dead_parents{$_}++ foreach (keys %active_modules_copy);
};
......@@ -2026,7 +2037,7 @@ sub do_custom_job {
my ($module_job, $dependencies_hash) = @_;
$module_job =~ /(\s)/o;
my $module = $`;
my $job = $';
my $job = $'; #'
html_store_job_info($dependencies_hash, $module_job);
my $error_code = 0;
if ($job eq $pre_job) {
......@@ -2461,7 +2472,7 @@ sub get_modules_passed {
if ($option =~ /(:)/) {
$option = $`;
print_error("\'--from\' switch collision") if ($build_all_cont);
$build_all_cont = $';
$build_all_cont = $'; #'
};
$$hash_ref{$option}++;
};
......@@ -3325,7 +3336,7 @@ sub run_server {
my %client_hash = ();
foreach (@client_data) {
/(=)/;
$client_hash{$`} = $';
$client_hash{$`} = $'; #'
}
my $pid = $client_hash{pid} . '@' . $client_host;
if (defined $client_hash{platform}) {
......@@ -3432,8 +3443,15 @@ sub get_job_string {
my $log_file = $jobs_hash{$job_dir}->{LONG_LOG_PATH};
my $full_job_dir = $job_dir;
if ($job_dir =~ /(\s)/o) {
$job = $';
$job = $deliver_command if ($job eq $post_job);
$job = $'; #'
print $echo . "determine if we need to deliver $job_dir\n";
if ($job eq $post_job) {
if( $is_gbuild{$job_dir} ) {
print "Skip deliver for gmake-built module $job_dir\n";
return'';
};
$job = $deliver_command
};
$full_job_dir = $module_paths{$`};
}
my $log_dir = File::Basename::dirname($log_file);
......
solenv/bin/linkoo
Dosyayı görüntüle @ 589f7ed2
......@@ -55,7 +55,6 @@ export SAL_ALLOW_LINKOO_SYMLINKS=1
my $dry_run = 0;
my $usage = 0;
my $LANG;
my $TARGET;
my $LIBVER;
......@@ -67,14 +66,13 @@ my $brand_program_dir = 'program';
my $ure_misc_dir = 'basis-link/ure-link/share/misc';
my $ure_java_dir = 'basis-link/ure-link/share/java';
my $ure_lib_dir = 'basis-link/ure-link/lib';
$program_dir = 'openoffice.org/basis-link/MacOS' if ($ENV{OS} eq 'MACOSX'); # FIXME probably wrong
my @exceptions = ( 'cppuhelper', 'sunjavaplugin', 'libjvmfwk' );
my %replaceable = (
$program_dir => '\.so',
$ure_lib_dir => '\.so',
$ure_java_dir => '\.jar$',
$program_dir . '/resource' => '\.res$',
$program_dir . '/classes' => '\.jar$',
'basis-link/share/config' => '\.zip$',
......@@ -332,6 +330,22 @@ sub link_pagein_files()
print "\n";
}
# link installed files back into src tree:
sub link_soffice_bin_files()
{
my $dest;
my $src = "$OOO_INSTALL/" . $brand_program_dir;
print "soffice files";
$dest = "$OOO_BUILD/desktop/$TARGET/bin";
do_link ($src, $dest, 'soffice', 'soffice.bin', 1);
do_link ($src, $dest, 'bootstraprc', 'bootstraprc', 1);
do_link ($src, $dest, 'intro.bmp', 'intro.bmp', 1);
do_link ("$OOO_INSTALL", "$OOO_BUILD/desktop/$TARGET", 'share', 'share', 1);
print "\n";
}
for my $a (@ARGV) {
# options
......@@ -379,6 +393,7 @@ link_iso_res();
link_types_rdb();
link_oovbaapi_rdb();
link_pagein_files();
link_soffice_bin_files();
if (!-f "$OOO_INSTALL/" . $brand_program_dir . "/ooenv") {
my $ooenv;
......
solenv/bin/modules/RepositoryHelper.pm
Dosyayı görüntüle @ 589f7ed2
......@@ -118,8 +118,7 @@ sub search_for_hg {
sub search_via_build_lst {
my $self = shift;
# my @possible_build_lists = ('build.lst', 'build.xlist'); # build lists names
my @possible_build_lists = ('build.lst'); # build lists names
my @possible_build_lists = ('gbuild.lst', 'build.lst'); # build lists names
my $previous_dir = '';
my $rep_root_candidate = $self->{INITIAL_DIRECTORY};
do {
......
solenv/bin/modules/SourceConfig.pm
Dosyayı görüntüle @ 589f7ed2
......@@ -78,6 +78,14 @@ sub new {
} else {
$source_root = $ENV{SOURCE_ROOT_DIR};
};
if ( defined $ENV{USE_GBUILD} and "$ENV{USE_GBUILD}" ne "" )
{
$self->{POSSIBLE_BUILD_LIST} = ('gbuild.lst', 'build.lst', 'build.xlist'); # build lists names
}
else
{
$self->{POSSIBLE_BUILD_LIST} = ('build.lst', 'build.xlist'); # build lists names
}
$source_root = Cwd::realpath($source_root);
$self->{SOURCE_ROOT} = $source_root;
$self->{DEBUG} = 0;
......@@ -94,6 +102,7 @@ sub new {
$self->{REMOVE_REPOSITORIES} = {};
$self->{NEW_REPOSITORIES} = [];
$self->{WARNINGS} = [];
$self->{GBUILD} = 0;
$self->{REPORT_MESSAGES} = [];
$self->{CONFIG_FILE_CONTENT} = [];
if (defined $self->{USER_SOURCE_ROOT}) {
......@@ -173,11 +182,14 @@ sub get_module_build_list {
if (defined ${$self->{MODULE_BUILD_LIST_PATHS}}{$module}) {
return ${$self->{MODULE_BUILD_LIST_PATHS}}{$module};
} else {
my @possible_build_lists = ('build.lst', 'build.xlist'); # build lists names
foreach (@possible_build_lists) {
my $possible_path = ${$self->{MODULE_PATHS}}{$module} . "/prj/$_";
my @possible_build_lists = $self->{POSSIBLE_BUILD_LIST}; # build lists names
foreach my $build_list (@possible_build_lists) {
my $possible_path = ${$self->{MODULE_PATHS}}{$module} . "/prj/$build_list";
if (-e $possible_path) {
${$self->{MODULE_BUILD_LIST_PATHS}}{$module} = $possible_path;
if ( $build_list eq "gbuild.lst" ) {
$self->{GBUILD} = 1;
};
return $possible_path;
};
};
......
solenv/gbuild/Deliver.mk
Dosyayı görüntüle @ 589f7ed2
......@@ -39,7 +39,7 @@ endef
define gb_Deliver_add_deliverable
gb_Deliver_DELIVERABLES += $$(patsubst $(REPODIR)/%,%,$(2)):$$(patsubst $(REPODIR)/%,%,$(1))
$(if $(gb_HIRESTIME),,.LOW_RESOLUTION_TIME : $(1))
$(if $(gb_LOWRESTIME),.LOW_RESOLUTION_TIME : $(1),)
endef
......
solenv/gbuild/Helper.mk
Dosyayı görüntüle @ 589f7ed2
# -*- Mode: GNUmakefile; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
......
solenv/inc/unxgcc.mk
Dosyayı görüntüle @ 589f7ed2
......@@ -158,6 +158,9 @@ LINK*=$(CXX)
LINKC*=$(CC)
# default linker flags
.IF "$(SYSBASE)"!=""
LINKFLAGS_SYSBASE:=-Wl,--sysroot=$(SYSBASE)
.ENDIF # "$(SYSBASE)"!=""
#
# The DT RPATH value is used first, before any other path, specifically before
# the path defined in the LD_LIBRARY_PATH environment variable. This is
......@@ -180,16 +183,16 @@ LINKFLAGSRUNPATH_OXT=
LINKFLAGSRUNPATH_BOXT=-Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\',--enable-new-dtags
LINKFLAGSRUNPATH_NONE=
# flag -Wl,-z,noexecstack sets the NX bit on the stack
LINKFLAGS=-Wl,-z,noexecstack -Wl,-z,combreloc $(LINKFLAGSDEFS)
LINKFLAGS=-Wl,-z,noexecstack -Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE)
.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,-rpath-link,$(LB):$(SOLARLIBDIR)
-Wl,-rpath-link,$(LB):$(SOLARLIBDIR):$(SYSBASE)/lib:$(SYSBASE)/usr/lib
LINKFLAGSAPPCUI= -Wl,-export-dynamic \
-Wl,-rpath-link,$(LB):$(SOLARLIBDIR)
-Wl,-rpath-link,$(LB):$(SOLARLIBDIR):$(SYSBASE)/lib:$(SYSBASE)/usr/lib
# linker flags for linking shared libraries
LINKFLAGSSHLGUI= -shared
......
soltools/mkdepend/def.h
Dosyayı görüntüle @ 589f7ed2
......@@ -61,9 +61,8 @@ in this Software without prior written authorization from the X Consortium.
#endif
#define MAXDEFINES 512
#define MAXFILES ( 1<<16 ) /* Increased from 512. -mcafee */
/* Increased from 1024. -mh */
/* Increased from 2048. -b_michaelsen */
#define MAXFILES 65536
#define MAXDIRS 64
#define SYMHASHSEED 131 /* 131 1313 13131 ... */
#define SYMHASHMEMBERS 64 /* must be 2^x to work right */
......
stlport/prj/d.lst
Dosyayı görüntüle @ 589f7ed2
..\systemstlguards\*.h %_DEST%\inc%_EXT%\stl\*.h
..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment