Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: ooo-dev@incubator.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1209570 - in /incubator/ooo/trunk/main: moz/makefile.mk
 nss/makefile.mk
Date: Fri, 02 Dec 2011 16:35:06 -0000
To: ooo-commits@incubator.apache.org
From: af@apache.org
Message-Id: <20111202163506.5FDBA2388A2C@eris.apache.org>

Author: af
Date: Fri Dec  2 16:35:05 2011
New Revision: 1209570

URL: http://svn.apache.org/viewvc?rev=1209570&view=rev
Log:
Fixed build breaker on Linux 3.0.* systems:  nss misses Linux3.0.mk files.

Modified:
    incubator/ooo/trunk/main/moz/makefile.mk
    incubator/ooo/trunk/main/nss/makefile.mk

Modified: incubator/ooo/trunk/main/moz/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/moz/makefile.mk?rev=1209570&r1=1209569&r2=1209570&view=diff
==============================================================================
--- incubator/ooo/trunk/main/moz/makefile.mk (original)
+++ incubator/ooo/trunk/main/moz/makefile.mk Fri Dec  2 16:35:05 2011
@@ -424,3 +424,15 @@ $(OUT)$/zipped$/$(OS)$(COM)UBruntime.zip
 .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

Modified: incubator/ooo/trunk/main/nss/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/nss/makefile.mk?rev=1209570&r1=1209569&r2=1209570&view=diff
==============================================================================
--- incubator/ooo/trunk/main/nss/makefile.mk (original)
+++ incubator/ooo/trunk/main/nss/makefile.mk Fri Dec  2 16:35:05 2011
@@ -154,16 +154,16 @@ BUILD_ACTION= PATH="$(moz_build)/msys/bi
 	-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 mo
 .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