687380 - Do not generate NSPR pkg/linux/* and pkg/solaris/* Makefiles on platforms where they will not be used

Status: RESOLVED FIXED

(NSPR :: NSPR, defect)

Description

[Ed Morley [:emorley]]

Building Firefox locally using MSVC 2010 with http://hg.mozilla.org/integration/mozilla-inbound/rev/f827e9173fea

Output from NSPR configure:
{
...
creating pkg/linux/Makefile
creating pkg/solaris/Makefile
creating pkg/solaris/SUNWpr/Makefile
creating pkg/solaris/SUNWprd/Makefile
...
}

/nsprpub/pkg/Makefile.in specifies the following:
{
ifeq ($(OS_TARGET),Linux)
DIRS = linux
endif
ifeq ($(OS_TARGET),SunOS)
DIRS = solaris
endif
}

So it would make sense to add something similar to configure:
http://mxr.mozilla.org/mozilla-central/source/nsprpub/configure.in#3322

Comment 1

[Ed Morley [:emorley]]

Attachment: Patch v1

Adds the same platform ifdefs to the configure makefiles output generation for pkg/linux/* and pkg/solaris/* as those found in pkg/Makefile.in.

Note: The patch was based off of mozilla-inbound, but this is intended for upstream NSPR. I decided against figuring out how to use CVS until after it's clear whether the patch will be r+'d. 

Thanks :-)

Comment 2

[Ed Morley [:emorley]]

Attachment: Patch v1.1

As above, but with brain engaged.

Comment 3

[Ed Morley [:emorley]]

https://tbpl.mozilla.org/?tree=Try&usebuildbot=1&rev=39b4ffb18fd5

Comment 4

[Ed Morley [:emorley]]

Attachment: Patch v2 - CVS diff

As previously r+'d, except:
* Is now a CVS diff.
* Removes the dnl lines since either dupes or else the makefiles to which they refer are NPOTB.
* Whitespace/wrapping/indentation improvements:
    -Removes trailing whitespace whilst I'm there
    -Splits the |MAKEFILES="$MAKEFILES foo/bar/Makefile"| entries onto 
     multiple lines for readability (also allows for easier parsing of 
     the generated makefiles for the script in bug 696498)
    -Adjusts indentation for readability (happy to take input on this 
     one, if you don't feel it's appropriate)

Presuming you're ok with the post r+ changes, can you land it for me please Ted :-)

Comment 5

[(not currently active) Ted Mielczarek]

Checking in configure;
/cvsroot/mozilla/nsprpub/configure,v  <--  configure
new revision: 1.317; previous revision: 1.316
done
Checking in configure.in;
/cvsroot/mozilla/nsprpub/configure.in,v  <--  configure.in
new revision: 1.319; previous revision: 1.318
done