diff options
| author | Andre Fischer <af@apache.org> | 2011-12-02 15:35:05 +0000 |
|---|---|---|
| committer | Andre Fischer <af@apache.org> | 2011-12-02 15:35:05 +0000 |
| commit | 62ec5f1eb484baea80b0fd01aef3c34cbb5bf189 (patch) | |
| tree | 06700544bafc585cb08b51dff576725c4410622f | |
| parent | 023b2923ef08aba020deb0f1cf1102c281bf20d0 (diff) | |
Fixed build breaker on Linux 3.0.* systems: nss misses Linux3.0.mk files.
| -rw-r--r-- | moz/makefile.mk | 12 | ||||
| -rw-r--r-- | nss/makefile.mk | 32 |
2 files changed, 33 insertions, 11 deletions
diff --git a/moz/makefile.mk b/moz/makefile.mk index 9237e69a4c91..c4d6ac26a5c8 100644 --- a/moz/makefile.mk +++ b/moz/makefile.mk @@ -424,3 +424,15 @@ $(OUT)$/zipped$/$(OS)$(COM)UBruntime.zip : zipped$/$(OS)$(COM)Pruntime.zip zippe .ENDIF # $(GUIBASE)=="aqua" .INCLUDE : extractfiles.mk + +# This is a hack to build on a Linux 3.0 system. Between unpacking +# the archive and building it, the existing Linux2.6.mk makefile is +# copied to Linux3.0.mk, which otherwise would be missing and break +# the build. See nss module for a similar hack. +# If someone finds a better solution then please change this. +.IF "$(OS)"=="LINUX" +BUILD_ACTION:= pwd&&$(COPY) \ + ../../mozilla/security/coreconf/Linux2.6.mk \ + ../../mozilla/security/coreconf/Linux3.0.mk \ + && $(BUILD_ACTION) +.ENDIF diff --git a/nss/makefile.mk b/nss/makefile.mk index c2f0bf5984ca..85a45262a8fe 100644 --- a/nss/makefile.mk +++ b/nss/makefile.mk @@ -154,16 +154,16 @@ BUILD_ACTION= PATH="$(moz_build)/msys/bin:$(moz_build)/moztools/bin:$(PATH)" && -c "cd $(NSS_BUILD_DIR) && make nss_build_all" OUT2LIB= \ - mozilla$/dist$/out$/lib$/nspr4.lib \ - mozilla$/dist$/out$/lib$/nss3.lib \ - mozilla$/dist$/out$/lib$/nssdbm3.lib \ - mozilla$/dist$/out$/lib$/nssutil3.lib \ - mozilla$/dist$/out$/lib$/plc4.lib \ - mozilla$/dist$/out$/lib$/plds4.lib \ - mozilla$/dist$/out$/lib$/smime3.lib \ - mozilla$/dist$/out$/lib$/softokn3.lib \ - mozilla$/dist$/out$/lib$/sqlite3.lib \ - mozilla$/dist$/out$/lib$/ssl3.lib + mozilla$/dist$/out$/lib$/nspr4.lib \ + mozilla$/dist$/out$/lib$/nss3.lib \ + mozilla$/dist$/out$/lib$/nssdbm3.lib \ + mozilla$/dist$/out$/lib$/nssutil3.lib \ + mozilla$/dist$/out$/lib$/plc4.lib \ + mozilla$/dist$/out$/lib$/plds4.lib \ + mozilla$/dist$/out$/lib$/smime3.lib \ + mozilla$/dist$/out$/lib$/softokn3.lib \ + mozilla$/dist$/out$/lib$/sqlite3.lib \ + mozilla$/dist$/out$/lib$/ssl3.lib .ENDIF # "$(COM)"=="GCC" @@ -179,4 +179,14 @@ OUTDIR2INC=mozilla$/dist$/public$/nss mozilla$/dist$/out$/include .INCLUDE : target.mk .INCLUDE : tg_ext.mk - +# This is a hack to build on a Linux 3.0 system. Between unpacking +# the archive and building it, the existing Linux2.6.mk makefile is +# copied to Linux3.0.mk, which otherwise would be missing and break +# the build. See moz module for a similar hack. +# If someone finds a better solution then please change this. +.IF "$(OS)"=="LINUX" +BUILD_ACTION:= $(COPY) \ + ../../../mozilla/security/coreconf/Linux2.6.mk \ + ../../../mozilla/security/coreconf/Linux3.0.mk \ + && $(BUILD_ACTION) +.ENDIF |