ooo-build r12192 - in trunk: . patches/dev300 patches/src680
- From: rengelhard svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r12192 - in trunk: . patches/dev300 patches/src680
- Date: Wed, 16 Apr 2008 20:05:29 +0100 (BST)
Author: rengelhard
Date: Wed Apr 16 20:05:29 2008
New Revision: 12192
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12192&view=rev
Log:
2008-04-16 Rene Engelhard <rene debian orgÂ
* patches/src680/configures-explicit-arch.diff,
patches/dev300/configures-explicit-arch.diff: fix dmake configure
call in ./bootstrap; rework dpkg-architecture calls
Modified:
trunk/ChangeLog
trunk/patches/dev300/configures-explicit-arch.diff
trunk/patches/src680/configures-explicit-arch.diff
Modified: trunk/patches/dev300/configures-explicit-arch.diff
==============================================================================
--- trunk/patches/dev300/configures-explicit-arch.diff (original)
+++ trunk/patches/dev300/configures-explicit-arch.diff Wed Apr 16 20:05:29 2008
@@ -15,13 +15,17 @@
diff -u -u -r1.21 bootstrap.1
--- config_office/bootstrap.1 26 Jun 2007 17:48:08 -0000 1.21
+++ config_office/bootstrap.1 11 Apr 2008 07:54:07 -0000
-@@ -36,7 +36,8 @@
+@@ -36,7 +36,12 @@
$GNUMAKE distclean || exit
fi
- ./configure $DMAKE_CONF || exit
-+ ./configure $DMAKE_CONF --host=$(DEB_HOST_GNU_TYPE) \
-+ --build=$(DEB_BUILD_GNU_TYPE) || exit
++ if [ -z "$DEB_HOST_GNU_TYPE" -o -z "$DEB_BUILD_GNU_TYPE" ]; then
++ DEB_HOST_GNU_TYPE=`dpkg-architecture -qDEB_HOST_GNU_TYPE | head -n 1`
++ DEB_BUILD_GNU_TYPE=`dpkg-architecture -qDEB_BUILD_GNU_TYPE Â head -n 1`
++ fi
++ ./configure $DMAKE_CONF --host=$DEB_HOST_GNU_TYPE \
++ --build=$DEB_BUILD_GNU_TYPE || exit
## invoke the gnu make command set by configure.
$GNUMAKE || exit
@@ -32,12 +36,17 @@
diff -u -u -r1.168.4.1 set_soenv.in
--- config_office/set_soenv.in 23 Jan 2008 17:07:28 -0000 1.168.4.1
+++ config_office/set_soenv.in 11 Apr 2008 07:54:08 -0000
-@@ -1602,6 +1602,8 @@
+@@ -1602,6 +1602,13 @@
CreateFileHeader( *OUT_SH, $UPD, $platform, "sh/bash/ksh", "#" );
CreateFileHeader( *OUT_BAT, $UPD, $platform, "4nt", "rem" ) if defined($outfile_bat);
-+ToFile( "DEB_BUILD_GNU_TYPE",`dpkg-architecture -qDEB_BUILD_GNU_TYPE | head -n 1`, "e" );
-+ToFile( "DEB_HOST_GNU_TYPE", `dpkg-architecture -qDEB_HOST_GNU_TYPE | head -n 1`, "e" );
++my $build_gnu_type=`dpkg-architecture -qDEB_BUILD_GNU_TYPE | head -n 1`;
++my $host_gnu_type=`dpkg-architecture -qDEB_HOST_GNU_TYPE | head -n 1`;
++chomp($build_gnu_type);
++chomp($host_gnu_type);
++
++ToFile( "DEB_BUILD_GNU_TYPE", $build_gnu_type, "e" );
++ToFile( "DEB_HOST_GNU_TYPE", $host_gnu_type, "e" );
ToFile( "SRC_ROOT", $SRC_ROOT, "e" );
ToFile( "SHELL", $SHELL, "e" );
ToFile( "JAVA_HOME", $JAVA_HOME, "e" );
Modified: trunk/patches/src680/configures-explicit-arch.diff
==============================================================================
--- trunk/patches/src680/configures-explicit-arch.diff (original)
+++ trunk/patches/src680/configures-explicit-arch.diff Wed Apr 16 20:05:29 2008
@@ -15,13 +15,17 @@
diff -u -u -r1.21 bootstrap.1
--- config_office/bootstrap.1 26 Jun 2007 17:48:08 -0000 1.21
+++ config_office/bootstrap.1 11 Apr 2008 07:54:07 -0000
-@@ -36,7 +36,8 @@
+@@ -36,7 +36,12 @@
$GNUMAKE distclean || exit
fi
- ./configure $DMAKE_CONF || exit
-+ ./configure $DMAKE_CONF --host=$(DEB_HOST_GNU_TYPE) \
-+ --build=$(DEB_BUILD_GNU_TYPE) || exit
++ if [ -z "$DEB_HOST_GNU_TYPE" -o -z "$DEB_BUILD_GNU_TYPE" ]; then
++ DEB_HOST_GNU_TYPE=`dpkg-architecture -qDEB_HOST_GNU_TYPE`
++ DEB_BUILD_GNU_TYPE=`dpkg-architecture -qDEB_BUILD_GNU_TYPE`
++ fi
++ ./configure $DMAKE_CONF --host=$DEB_HOST_GNU_TYPE \
++ --build=$DEB_BUILD_GNU_TYPE || exit
## invoke the gnu make command set by configure.
$GNUMAKE || exit
@@ -32,12 +36,17 @@
diff -u -u -r1.168.4.1 set_soenv.in
--- config_office/set_soenv.in 23 Jan 2008 17:07:28 -0000 1.168.4.1
+++ config_office/set_soenv.in 11 Apr 2008 07:54:08 -0000
-@@ -1602,6 +1602,8 @@
+@@ -1602,6 +1602,13 @@
CreateFileHeader( *OUT_SH, $UPD, $platform, "sh/bash/ksh", "#" );
CreateFileHeader( *OUT_BAT, $UPD, $platform, "4nt", "rem" ) if defined($outfile_bat);
-+ToFile( "DEB_BUILD_GNU_TYPE",`dpkg-architecture -qDEB_BUILD_GNU_TYPE | head -n 1`, "e" );
-+ToFile( "DEB_HOST_GNU_TYPE", `dpkg-architecture -qDEB_HOST_GNU_TYPE | head -n 1`, "e" );
++my $build_gnu_type=`dpkg-architecture -qDEB_BUILD_GNU_TYPE | head -n 1`;
++my $host_gnu_type=`dpkg-architecture -qDEB_HOST_GNU_TYPE | head -n 1`;
++chomp($build_gnu_type);
++chomp($host_gnu_type);
++
++ToFile( "DEB_BUILD_GNU_TYPE", $build_gnu_type, "e" );
++ToFile( "DEB_HOST_GNU_TYPE", $host_gnu_type, "e" );
ToFile( "SRC_ROOT", $SRC_ROOT, "e" );
ToFile( "SHELL", $SHELL, "e" );
ToFile( "JAVA_HOME", $JAVA_HOME, "e" );
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]