packages: icedtea6/icedtea6.spec - hack to stop an inatalled dpkg-architect...

[jajcus]

Author: jajcus                       Date: Fri Apr 16 15:33:29 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- hack to stop an inatalled dpkg-architecture from breaking the build

---- Files affected:
packages/icedtea6:
   icedtea6.spec (1.39 -> 1.40) 

---- Diffs:

================================================================
Index: packages/icedtea6/icedtea6.spec
diff -u packages/icedtea6/icedtea6.spec:1.39 packages/icedtea6/icedtea6.spec:1.40
--- packages/icedtea6/icedtea6.spec:1.39	Fri Apr 16 15:52:49 2010
+++ packages/icedtea6/icedtea6.spec	Fri Apr 16 17:33:23 2010
@@ -390,6 +390,9 @@
 # Cannot do that as patch, as the sources are prepared by make
 %{__sed} -i -e's/CORBA_BUILD_ARGUMENTS = \\/CORBA_BUILD_ARGUMENTS = JVMLIB="" \\/' openjdk-ecj/make/corba-rules.gmk
 %endif
+# if dpkg-architecure is installed (like on carme) it will break the build
+# unless we disable using it somehow. As patching is difficult here:
+sed -i -e's/dpkg-architecture/dpkg-architecture__/' openjdk*/jdk/make/common/shared/Platform.gmk
 
 %{__make} -j1 \
 	PRINTF=/bin/printf
@@ -813,6 +816,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.40  2010/04/16 15:33:23  jajcus
+- hack to stop an inatalled dpkg-architecture from breaking the build
+
 Revision 1.39  2010/04/16 13:52:49  jajcus
 - set JAVA_HOME and PATH... otherwise it works, but configure seems to take random javac from /usr/bin then, which may be unreliable
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/icedtea6/icedtea6.spec?r1=1.39&r2=1.40&f=u