config_host.mk.in | 203 --
configure.in |5 +
desktop/branding/Makefile |4
set_soenv.in | 197
solenv/bin/linkoo | 29 --
solenv/inc/unitools.mk|6 -
6 files changed, 212 insertions(+), 232 deletions(-)
New commits:
commit ea5d18a1c7c5916be0f97db1ecba07db5b9cb5cd
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Sun Jan 1 16:05:16 2012 -0600
move UDP and fix linkoo to look for INPATH and UPD in config_host.mk
diff --git a/config_host.mk.in b/config_host.mk.in
index b17207d..8077384 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -360,6 +360,7 @@ export SYSTEM_ZLIB=@SYSTEM_ZLIB@
export THES_SYSTEM_DIR=@THES_SYSTEM_DIR@
export TYPO_EXTENSION_PACK=@TYPO_EXTENSION_PACK@
export UNIXWRAPPERNAME=@UNIXWRAPPERNAME@
+export UPD=@UPD@
export USE_FT_EMBOLDEN=@USE_FT_EMBOLDEN@
export USE_XINERAMA=@USE_XINERAMA@
export VALGRIND_CFLAGS=@VALGRIND_CFLAGS@
diff --git a/set_soenv.in b/set_soenv.in
index 4276058..fafc9ed 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1327,7 +1327,6 @@ if (@WITH_VC_REDIST@ eq TRUE) {
ToFile( WITH_VC_REDIST, TRUE, e );
}
ToFile( PERL, $PERL, e );
-ToFile( UPD, $UPD, e );
ToFile( WORK_STAMP,$WORK_STAMP,e );
ToFile( SOLARVER, $SOLARVER, e );
ToFile( SOLARVERSION, $SOLARVERSION, e );
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index ade1ee7..06a103d 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -141,35 +141,10 @@ my @known_duplicates = ( 'db.jar', 'libi18n',
'libnssckbi', 'libnssdbm', 'libsql
sub sniff_target($)
{
my $build_dir = shift;
-my ($dirhandle, $fname);
my ($target, $libver, $lang) = ( 'unxlngi6.pro', '680', 'en-US' ); #
defaults
-opendir ($dirhandle, $build_dir) || die Can't open $build_dir;
-while ($fname = readdir ($dirhandle)) {
-if ($fname =~ /Host.sh$/) {
-my $file;
-open ($file, $build_dir/$fname) || die Can't open
$build_dir/$fname;
-while ($file) {
-/\s*(\S+)\s*=\s*\(\S+)\/ || next;
-if ($1 eq 'UPD') {
-$libver = $2;
-}
-}
-close ($file);
-} elsif ($fname =~ /host.mk$/) {
-my $file;
-open ($file, $build_dir/$fname) || die Can't open
$build_dir/$fname;
-while ($file) {
-/\s*export\s*(\S+)\s*=\s*\(\S+)\/ || next;
-if ($1 eq 'INPATH') {
-$target = $2;
-}
-}
-close ($file);
-}
-}
-
-closedir ($dirhandle);
+chomp($target=`cat $build_dir/config_host.mk | grep INPATH= | sed -e
's/.*=//' | sed -e 's///g'`);
+chomp($libver=`cat $build_dir/config_host.mk | grep UPD= | sed -e
's/.*=//' | sed -e 's///g'`);
print Sniffed target: $target, $libver\n;
commit 49319b288f40ba13b24799136caa97863d523e39
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Sun Jan 1 02:43:30 2012 -0600
migrate non-conditional straight from configure.in var out of set_soenv.in
diff --git a/config_host.mk.in b/config_host.mk.in
index ebd3d46..b17207d 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -4,14 +4,33 @@
#
export SRC_ROOT=@SRC_ROOT@
+@x_ICU@ export ICU_MAJOR=@ICU_MAJOR@
+@x_ICU@ export ICU_MICRO=@ICU_MICRO@
+@x_ICU@ export ICU_MINOR=@ICU_MINOR@
export ABOUT_BITMAP=@ABOUT_BITMAP@
+export ALIGNOF_DOUBLE=@ALIGNOF_DOUBLE@
+export ALIGNOF_INT=@ALIGNOF_INT@
+export ALIGNOF_LONG=@ALIGNOF_LONG@
+export ALIGNOF_SHORT=@ALIGNOF_SHORT@
+export ALLOC=@ALLOC@
export ANCIENT_BISON=@ANCIENT_BISON@
export AR=@AR@
+export AWTLIB='@AWTLIB@'
+export BARCODE_EXTENSION_PACK=@BARCODE_EXTENSION_PACK@
export BSH_JAR=@BSH_JAR@
+export BUILD_DMAKE=@BUILD_DMAKE@
+export BUILD_EPM=@BUILD_EPM@
+export BUILD_MOZAB=@BUILD_MOZAB@
+export BUILD_NCPUS=@BUILD_NCPUS@
+export BUILD_POSTGRESQL_SDBC=@BUILD_POSTGRESQL_SDBC@
+export BUILD_STAX=@BUILD_STAX@
+export BUILD_UNOWINREG=@BUILD_UNOWINREG@
+export BUILD_VER_STRING=@BUILD_VER_STRING@
export CAIRO_CFLAGS=@CAIRO_CFLAGS@
export CAIRO_LIBS=@CAIRO_LIBS@
export CDR_CFLAGS=@CDR_CFLAGS@
export CDR_LIBS=@CDR_LIBS@
+export CL_X64=@CL_X64@
export COM=@COM@
export COMMONS_CODEC_JAR=@COMMONS_CODEC_JAR@
export COMMONS_HTTPCLIENT_JAR=@COMMONS_HTTPCLIENT_JAR@
@@ -25,14 +44,26 @@ export CPUNAME=@CPUNAME@
export CPUNAME_FOR_BUILD=@CPUNAME_FOR_BUILD@
export CPU_FOR_BUILD=@CPU_FOR_BUILD@
export CROSS_COMPILING=@CROSS_COMPILING@
+export CT2N_EXTENSION_PACK=@CT2N_EXTENSION_PACK@
export CURL_CFLAGS=@CURL_CFLAGS@
export CURL_LIBS=@CURL_LIBS@
+export DATADIR=@DATADIR@
export DBUSMENUGTK_CFLAGS=@DBUSMENUGTK_CFLAGS@
export DBUSMENUGTK_LIBS=@DBUSMENUGTK_LIBS@
export DBUS_CFLAGS=@DBUS_CFLAGS@
export DBUS_LIBS=@DBUS_LIBS@
+export
