------------------------------------------------------------
revno: 2019
committer: Rene Engelhard <[email protected]>
branch nick: unstable
timestamp: Fri 2010-06-11 00:27:36 +0200
message:
fix ooo-builds check whether we can enable nodep=true
added:
patches/fix-nodep-check.diff
modified:
changelog
patches/series
=== modified file 'changelog'
--- a/changelog 2010-06-10 14:07:27 +0000
+++ b/changelog 2010-06-10 22:27:36 +0000
@@ -4,7 +4,10 @@
support, thanks Sebastian Andrzej Siewior
* debian/patches/fix-smoketest-without-java.diff: disable tests which
need Java if Java is disabled
-
+ * debian/patches/fix-nodep-check.diff: fix ooo-builds check whether
+ we can enable nodep=true to actually work with system dmake. Big effect
+ on build time
+
* debian/control.in:
- update Vcs-Bzr:
* debian/rules:
@@ -13,7 +16,7 @@
* debian/smoketest/*, debian/rules: disable Databse{Insert,Delete,Seek} tests
on armel. No regression and works if used "correctly" inside OOo
- -- Rene Engelhard <[email protected]> Wed, 09 Jun 2010 01:19:22 +0200
+ -- Rene Engelhard <[email protected]> Thu, 10 Jun 2010 18:02:35 +0200
openoffice.org (1:3.2.1-1) unstable; urgency=medium
=== added file 'patches/fix-nodep-check.diff'
--- a/patches/fix-nodep-check.diff 1970-01-01 00:00:00 +0000
+++ b/patches/fix-nodep-check.diff 2010-06-10 22:27:36 +0000
@@ -0,0 +1,20 @@
+diff --git a/bin/build-ooo b/bin/build-ooo
+index 6a4cd28..4553a94 100755
+--- openoffice.org-3.2.1/ooo-build-3-2-1-3/bin/build-ooo
++++ openoffice.org-3.2.1/ooo-build-3-2-1-3/bin/build-ooo
+@@ -75,12 +75,11 @@ else
+ . $OOBUILDDIR/*.Set.sh
+ fi
+
+-# Check to see if dmake was not there - if not, this is a from-pristine build
+-echo "Build: z$BUILD_DMAKE == zYES -a ! -f $SOLARENV/$OUTPATH/bin/dmake";
+-if test "z$BUILD_DMAKE" == "zYES" -a ! -f "$SOLARENV/$OUTPATH/bin/dmake"; then
++# Check to see if makedepend was not there - if not, this is a from-pristine
build
++if test ! -f $OOBUILDDIR/soltools/$OUTPATH/bin/makedepend; then
+ # Accelerate straight-through compiles by not building / using
dependencies
+ echo "A very clean straight-through build - deferring dep generation"
+- export nodep=1
++ export nodep=true
+ else
+ echo "Building with full dependencies"
+ fi
=== modified file 'patches/series'
--- a/patches/series 2010-06-10 14:07:27 +0000
+++ b/patches/series 2010-06-10 22:27:36 +0000
@@ -4,3 +4,4 @@
fix-save-performance-with-hidden-rows.diff
powerpc-fixes.diff
fix-smoketest-without-java.diff
+fix-nodep-check.diff
