[Pkg-ace-devel] Bug#289158: mpc-ace: MPC needs ACE_ROOT and TAO_ROOT environment variables

[Thomas Girard]

This is a multi-part message in MIME format.
--------------060007030407030608070405
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: quoted-printable

Marek Brudka a =E9crit :
> MPC generated makefiles needs these variables to run correctly. AFAIK
> debian ace distribution should not depend on these variables, hence I
> think mpc-ace violates this and should be corrected.

Hi Marek,

I have a quite simple fix, but I would like to discuss it with you. My
fix is attached ; it simply define ACE_ROOT to be /usr/share/ace and
export this in the GNUmakefile if there were no ACE_ROOT defined.

This should fix the bug you reported, but there is another problem. I
have added `export' keyword so that ACE_ROOT variable is seen when
invoking for instance tao_idl. Because tao_idl *also* needs ACE_ROOT (at
last it complains about it when it's missing).

I believe there should be no `export' keyword, but all TAO and ACE
programs should be altered to use /usr/share/ace instead of relying on
ACE_ROOT.

Comments and suggestions ?

Regards,

Thomas

--------------060007030407030608070405
Content-Type: text/plain;
 name="92-default-ACE_ROOT.dpatch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="92-default-ACE_ROOT.dpatch"

#! /bin/sh /usr/share/dpatch/dpatch-run
## 92-default-ACE_ROOT.dpatch by Thomas Girard <thomas.g.girard@free.fr>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Automatically set ACE_ROOT to /usr/share/ace in MPC generated
## DP: GNUmakefile if no ACE_ROOT is set.

@DPATCH@

Index: ACE_wrappers/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm
===================================================================
--- ACE_wrappers.orig/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm	2004-10-28 18:13:32.000000000 +0200
+++ ACE_wrappers/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm	2005-01-14 23:31:02.000000000 +0100
@@ -77,6 +77,9 @@
             "ifeq (\$(findstring k,\$(MAKEFLAGS)),k)$crlf",
             "  KEEP_GOING = -$crlf",
             "endif$crlf$crlf",
+	    "ifndef ACE_ROOT$crlf",
+	    "  export ACE_ROOT = /usr/share/ace$crlf",
+	    "endif$crlf",
             "include \$(ACE_ROOT)/include/makeinclude/macros.GNU$crlf",
             $crlf;
 

--------------060007030407030608070405--