[Libreoffice] [PATCH] Fix fdo#42783 get rid of CPU define/build system variable

Bjoern Michaelsen bjoern.michaelsen at canonical.com
Tue Dec 20 08:45:53 PST 2011

On Tue, Dec 20, 2011 at 04:43:41AM -0600, Norbert Thiebaud wrote:
> a/
>  if ( "@WITH_MOZILLA@" eq "YES" and "@BUILD_MOZAB@" ne "TRUE" and
>  {
>     print("Checking for prebuilt Mozilla libraries ...");
>     my $mozbinfile = $SRC_ROOT."/moz/zipped/";
> -   $mozbinfile .= $OS.$COM.$CPU;
> +   $mozbinfile .= $OS.$COM.$CPUNAME;
>     if ( -e $mozbinfile."inc.zip"
> These filename have not actually changed. they are hosted in our web
> site and we can't ust 'rename' them or we would break 3.4/3.5 and any
> version prior to the patch

Ok, so we have to keep CPU for now. Id suggest to maybe rename CPU to
CPU_DEPRECATED, if we are down to the stuff that cant be easily removed, so
that it doesnt creep back in.

> b/ INPATH adn OUPATH have a name that is today constructed based on
> CPU... removing that 1 letter shortcut from the rest of the product
> will render these naming convention even more opaque.

IMHO (other might disagree), we should get rid of these opaque names in the
long run anyway. INPATH and OUTPATH should only be "build" or "host".

> e/ there are missed occurrences, like in hyphen, lpsolve, redland...
> for instance. you can't remove the setup in set_soenv.in until _all_
> use case have been removed.
> so maybe first patching out the use cases -- starting with the one
> that are straight forward and fo not have side effect --  and then...
> a final patch that clean-up set_soenv.in once we are sure there is
> nothing left.

Yes, for now lets just EasyHack the ones that are easy to remove incrementally
and keep CPU in set_soenv.in for now.



More information about the LibreOffice mailing list