Date: prev next · Thread: first prev next last
2011 Archives by date, by thread · List index


Hi *,

attached patch fixes a build breakage on Mac, in the re-added NLP
solver. Three reviews needed for 3-4-0 please.

The original commit is a22d8e9fbecfe6f2febdf4f85892f00e48ad0b79
(extensions)

Cheers,

-- Thorsten
From a22d8e9fbecfe6f2febdf4f85892f00e48ad0b79 Mon Sep 17 00:00:00 2001
From: Thorsten Behrens <tbehrens@novell.com>
Date: Fri, 20 May 2011 09:22:24 +0200
Subject: [PATCH] Removed GNUism in makefile
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The --preserve=timestamps is a gnu cp extension, and thus not
available on all our platforms. Replaced by equivalent tar hack.

Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
---
 nlpsolver/makefile.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/nlpsolver/makefile.mk b/nlpsolver/makefile.mk
index ec7a063..a7d0996 100644
--- a/nlpsolver/makefile.mk
+++ b/nlpsolver/makefile.mk
@@ -46,7 +46,7 @@ PATCH_FILES=nlpsolver-0.9.patch
 
 ANT_FLAGS+=-Dplatforms.JDK_1.5.home=$(JAVA_HOME) -Doffice.program.dir=$(SOLARBINDIR)
 
-CONFIGURE_ACTION=cp -rv --preserve=timestamps ../../../../locale src/
+CONFIGURE_ACTION=(cd ../../../../locale && $(GNUTAR) -cf - .) | (cd src/ && $(GNUTAR) xf -)
 
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
-- 
1.7.3.4

Attachment: pgpPTLRqeF5cv.pgp
Description: PGP signature


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.