Author: metze Date: 2006-09-06 15:28:20 +0000 (Wed, 06 Sep 2006) New Revision: 18183
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18183 Log: - add LIBREPLACE globaly and add LIBREPLACE_HOSTCC - also specify USE_HOSTCC = YES on binaries that use HOSTCC I also disable autodependecies as this change let make run forever, I hopefully fix that tomorrow metze Modified: branches/SAMBA_4_0/source/build/m4/check_cc.m4 branches/SAMBA_4_0/source/build/smb_build/config_mk.pm branches/SAMBA_4_0/source/build/smb_build/input.pm branches/SAMBA_4_0/source/build/smb_build/makefile.pm branches/SAMBA_4_0/source/heimdal_build/config.mk branches/SAMBA_4_0/source/lib/replace/config.mk Changeset: Modified: branches/SAMBA_4_0/source/build/m4/check_cc.m4 =================================================================== --- branches/SAMBA_4_0/source/build/m4/check_cc.m4 2006-09-06 15:17:25 UTC (rev 18182) +++ branches/SAMBA_4_0/source/build/m4/check_cc.m4 2006-09-06 15:28:20 UTC (rev 18183) @@ -285,6 +285,7 @@ new_make=yes fi fi +new_make=no AC_MSG_RESULT($new_make) automatic_dependencies=no AX_CFLAGS_GCC_OPTION([-M -MT conftest.d -MF conftest.o], [], [ automatic_dependencies=$new_make ], []) Modified: branches/SAMBA_4_0/source/build/smb_build/config_mk.pm =================================================================== --- branches/SAMBA_4_0/source/build/smb_build/config_mk.pm 2006-09-06 15:17:25 UTC (rev 18182) +++ branches/SAMBA_4_0/source/build/smb_build/config_mk.pm 2006-09-06 15:28:20 UTC (rev 18183) @@ -76,7 +76,9 @@ "PUBLIC_HEADERS" => "list", "CFLAGS" => "string", - "STANDARD_VISIBILITY" => "string" + "STANDARD_VISIBILITY" => "string", + + "USE_HOSTCC" => "bool" }, "LIBRARY" => { "VERSION" => "string", Modified: branches/SAMBA_4_0/source/build/smb_build/input.pm =================================================================== --- branches/SAMBA_4_0/source/build/smb_build/input.pm 2006-09-06 15:17:25 UTC (rev 18182) +++ branches/SAMBA_4_0/source/build/smb_build/input.pm 2006-09-06 15:28:20 UTC (rev 18183) @@ -30,6 +30,25 @@ return split /[ \t\n]/; } +sub add_libreplace($) +{ + my ($part) = @_; + + return if ($part->{NAME} eq "LIBREPLACE"); + return if ($part->{NAME} eq "LIBREPLACE_HOSTCC"); + + foreach my $n (@{$part->{PRIVATE_DEPENDENCIES}}) { + return if ($n eq "LIBREPLACE"); + return if ($n eq "LIBREPLACE_HOSTCC"); + } + + if (defined($part->{USE_HOSTCC}) && $part->{USE_HOSTCC} eq "YES") { + push (@{$part->{PRIVATE_DEPENDENCIES}}, "LIBREPLACE_HOSTCC"); + } else { + push (@{$part->{PRIVATE_DEPENDENCIES}}, "LIBREPLACE"); + } +} + sub check_subsystem($$$) { my ($INPUT, $subsys, $default_ot) = @_; @@ -38,6 +57,7 @@ unless(defined($subsys->{OUTPUT_TYPE})) { $subsys->{OUTPUT_TYPE} = $default_ot; } + add_libreplace($subsys); } sub check_module($$$) @@ -75,6 +95,7 @@ } else { push (@{$INPUT->{$mod->{SUBSYSTEM}}{INIT_FUNCTIONS}}, $mod->{INIT_FUNCTION}) if defined($mod->{INIT_FUNCTION}); } + add_libreplace($mod); } sub check_library($$$) @@ -100,6 +121,7 @@ } $lib->{INSTALLDIR} = "LIBDIR"; + add_libreplace($lib); } sub check_binary($$) @@ -111,6 +133,7 @@ ($bin->{BINARY} = (lc $bin->{NAME})) if not defined($bin->{BINARY}); $bin->{OUTPUT_TYPE} = "BINARY"; + add_libreplace($bin); } sub import_integrated($$) Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm =================================================================== --- branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2006-09-06 15:17:25 UTC (rev 18182) +++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2006-09-06 15:28:20 UTC (rev 18183) @@ -117,7 +117,7 @@ } if (!(abs_path($self->{config}->{srcdir}) eq abs_path($self->{config}->{builddir}))) { - $builddir_headers= "-I\$(builddir)/include -I\$(builddir)/lib/replace -I\$(builddir) -I\$(builddir)/lib "; + $builddir_headers= "-I\$(builddir)/include -I\$(builddir) -I\$(builddir)/lib "; } $self->output(<< "__EOD__" @@ -126,7 +126,7 @@ PERL=$self->{config}->{PERL} CPP=$self->{config}->{CPP} -CPPFLAGS=$builddir_headers-I\$(srcdir)/include -I\$(srcdir)/lib/replace -I\$(srcdir) -I\$(srcdir)/lib -D_SAMBA_BUILD_ -DHAVE_CONFIG_H $self->{config}->{CPPFLAGS} +CPPFLAGS=$builddir_headers-I\$(srcdir)/include -I\$(srcdir) -I\$(srcdir)/lib -D_SAMBA_BUILD_ -DHAVE_CONFIG_H $self->{config}->{CPPFLAGS} CC=$self->{config}->{CC} CFLAGS=$self->{config}->{CFLAGS} \$(CPPFLAGS) Modified: branches/SAMBA_4_0/source/heimdal_build/config.mk =================================================================== --- branches/SAMBA_4_0/source/heimdal_build/config.mk 2006-09-06 15:17:25 UTC (rev 18182) +++ branches/SAMBA_4_0/source/heimdal_build/config.mk 2006-09-06 15:28:20 UTC (rev 18183) @@ -393,6 +393,7 @@ # Start BINARY asn1_compile [BINARY::asn1_compile] CFLAGS = -Iheimdal_build -Iheimdal/lib/roken +USE_HOSTCC = YES OBJ_FILES = \ ../heimdal/lib/asn1/main.ho \ ../heimdal/lib/asn1/gen.ho \ @@ -412,10 +413,8 @@ ../heimdal/lib/roken/estrdup.ho \ ../heimdal/lib/roken/ecalloc.ho \ ../heimdal/lib/asn1/symbol.ho \ - replace.ho \ ../heimdal/lib/vers/print_version.ho \ - ../lib/replace/snprintf.ho \ - ../lib/replace/replace.ho + replace.ho PRIVATE_DEPENDENCIES = HEIMDAL_ASN1_COMPILE_LEX HEIMDAL_ROKEN_GETPROGNAME_H # End BINARY asn1_compile ####################### @@ -432,6 +431,7 @@ # Start BINARY compile_et [BINARY::compile_et] CFLAGS = -Iheimdal_build -Iheimdal/lib/roken +USE_HOSTCC = YES OBJ_FILES = ../heimdal/lib/vers/print_version.ho \ ../heimdal/lib/com_err/parse.ho \ ../heimdal/lib/com_err/compile_et.ho \ @@ -439,9 +439,7 @@ ../heimdal/lib/roken/get_window_size.ho \ ../heimdal/lib/roken/strupr.ho \ ../heimdal/lib/roken/setprogname.ho \ - replace.ho \ - ../lib/replace/snprintf.ho \ - ../lib/replace/replace.ho + replace.ho PRIVATE_DEPENDENCIES = HEIMDAL_COM_ERR_COMPILE_LEX HEIMDAL_ROKEN_GETPROGNAME_H # End BINARY compile_et ####################### Modified: branches/SAMBA_4_0/source/lib/replace/config.mk =================================================================== --- branches/SAMBA_4_0/source/lib/replace/config.mk 2006-09-06 15:17:25 UTC (rev 18182) +++ branches/SAMBA_4_0/source/lib/replace/config.mk 2006-09-06 15:28:20 UTC (rev 18183) @@ -18,3 +18,12 @@ PUBLIC_DEPENDENCIES = REPLACE_READDIR DL # End SUBSYSTEM LIBREPLACE ############################## + +[SUBSYSTEM::LIBREPLACE_HOSTCC] +CFLAGS = -Ilib/replace +OBJ_FILES = replace.ho \ + snprintf.ho \ + dlfcn.ho \ + getpass.ho \ + timegm.ho +