incubator-ooo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Maho NAKATA <m...@apache.org>
Subject Re: small patch to AOO
Date Fri, 28 Sep 2012 02:30:03 GMT
Hi again

do you mind applying follwing patch?
without that, even though  apache-commons are specified
in the configure, it does use internal one instead.

$ less files/patch-configure.in 
--- configure.in~       2012-09-21 20:42:22.000000000 +0900
+++ configure.in        2012-09-26 13:32:06.000000000 +0900
@@ -52,6 +52,9 @@
 AC_ARG_WITH(system-graphite,
 [  --with-system-graphite    use graphite library already installed on system
 ],,)
+AC_ARG_WITH(system-apache-commons,
+[  --with-system-apache-commons    use apache-commons jar files already installed on system
+],,)
 AC_ARG_ENABLE(online-update,
 [  --disable-online-update Disables the Online Update feature.
 ],,enable_online_update=yes)



From: Maho NAKATA <maho@apache.org>
Subject: small patch to AOO
Date: Fri, 28 Sep 2012 11:28:26 +0900 (JST)

> Hi Pedro and *,
> 
> do you mind applying follwing patch?
> 
> FreeBSD system sed doesn't accept -i itself.
> it should be -i.bak and it looks we should specify
> prior to -r or -e.
> 
> $ less files/patch-sed 
> --- swext/mediawiki/makefile.mk 2012-09-21 20:36:58.000000000 +0900
> +++ swext/mediawiki/makefile.mk 2012-09-26 16:36:38.000000000 +0900
> @@ -50,10 +50,10 @@
>  
>  fix_system_commons:
>         @echo "Fix Java Class-Path entry for Apache Commons libraries from system."
> -       @$(SED) -r -e "s#(name=\"Class-Path\" value=\").*\"#\1file://$(COMMONS_CODEC_JAR)
file://$(COMMONS_LANG_JAR) \
> -file://$(COMMONS_HTTPCLIENT_JAR) file://$(COMMONS_LOGGING_JAR)\"#" -i build.xml
> +       @$(SED) -i.bak -r -e "s#(name=\"Class-Path\" value=\").*\"#\1file://$(COMMONS_CODEC_JAR)
file://$(COMMONS_LANG_JAR) \
> +file://$(COMMONS_HTTPCLIENT_JAR) file://$(COMMONS_LOGGING_JAR)\"#" build.xml
>         @echo "Unbundle Apache Commons libraries from Mediawiki Presentation extension."
> -       @$(SED) '/file="..commons/d' -i build.xml
> +       @$(SED) -i.bak '/file="..commons/d' build.xml
>  
>  .ELSE
>  @all:
> 
> Thanks
>  Nakata Maho

Mime
View raw message