[packages/icedtea7: 47/103] - hack to stop an inatalled dpkg-architecture from breaking the build

[jajcus]

commit fcb2e40e13d634bdedbb28664a3a280ea7e427d6
Author: Jacek Konieczny <jajcus at pld-linux.org>
Date:   Fri Apr 16 15:33:23 2010 +0000

    - hack to stop an inatalled dpkg-architecture from breaking the build
    
    Changed files:
        icedtea6.spec -> 1.40

 icedtea6.spec | 3 +++
 1 file changed, 3 insertions(+)
---
diff --git a/icedtea6.spec b/icedtea6.spec
index 0231b60..6d9a822 100644
--- a/icedtea6.spec
+++ b/icedtea6.spec
@@ -389,6 +389,9 @@ export PATH="$JAVA_HOME/bin:$PATH"
 # 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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/icedtea7.git/commitdiff/f360048b2271851d733c2fc755b8e7cae2f337cf