[Libreoffice-commits] .: Branch 'libreoffice-3-3' - bin/package-ooo

Robert Nagy rnagy at kemper.freedesktop.org
Wed Nov 10 09:08:36 PST 2010


 bin/package-ooo |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c476aa9af84f65ffe430457ac3a306e7a61e1883
Author: Robert Nagy <robert at openbsd.org>
Date:   Wed Nov 10 18:07:15 2010 +0100

    Make sure we don't call uname -i on platforms not supporting it

diff --git a/bin/package-ooo b/bin/package-ooo
index 393859e..62e7478 100755
--- a/bin/package-ooo
+++ b/bin/package-ooo
@@ -140,7 +140,7 @@ echo "Building $OOINSTDIR/basis$VERSION/program/java-set-classpath";
 sed -e "s|@OOINSTBASE@|$OOINSTBASE|g" $TOOLSDIR/bin/java-set-classpath.in >| "$OOBUILDDIR/java-set-classpath" || exit 1;
 install_script $OOBUILDDIR/java-set-classpath $OOINSTDIR/basis$VERSION/program/java-set-classpath
 
-if test "`uname -i`" = "i386" ; then
+if test "z`uname -s`" != "zOpenBSD" && test "`uname -i`" = "i386"; then
     echo "Building $OOINSTDIR/basis$VERSION/program/pyunorc-update64";
     sed -e "s|@OOINSTBASE@|$OOINSTBASE|g" $TOOLSDIR/bin/pyunorc-update64.in >| "$OOBUILDDIR/pyunorc-update64" || exit 1;
     install_script $OOBUILDDIR/pyunorc-update64 $OOINSTDIR/basis$VERSION/program/pyunorc-update64


More information about the Libreoffice-commits mailing list