Sun Jan 20 12:51:44 2008 UTC ()
Use EMUL_ARCH instead of MACHINE_ARCH for x86_64 platform using 32bit binary.
Problem reported in PR 37725.


(obache)
diff -r1.7 -r1.8 pkgsrc/lang/sun-jre6/Makefile.common
cvs diff -r1.7 -r1.8 pkgsrc/lang/sun-jre6/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/lang/sun-jre6/Attic/Makefile.common 2008/01/20 09:21:35 1.7
+++ pkgsrc/lang/sun-jre6/Attic/Makefile.common 2008/01/20 12:51:43 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.7 2008/01/20 09:21:35 tnn Exp $ 1# $NetBSD: Makefile.common,v 1.8 2008/01/20 12:51:43 obache Exp $
2 2
3CATEGORIES= lang java 3CATEGORIES= lang java
4COMMENT= Sun's Java(tm) 2 Standard Edition, ${DOWNLOAD_NAME} 4COMMENT= Sun's Java(tm) 2 Standard Edition, ${DOWNLOAD_NAME}
5EXTRACT_SUFX= .bin 5EXTRACT_SUFX= .bin
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://java.sun.com/ 8HOMEPAGE= http://java.sun.com/
9DOWNLOAD= http://java.sun.com/javase/downloads/index.jsp 9DOWNLOAD= http://java.sun.com/javase/downloads/index.jsp
10ARCHIVE= http://java.sun.com/products/archive/ 10ARCHIVE= http://java.sun.com/products/archive/
11 11
12RESTRICTED= Redistribution of repackaged binaries not permitted 12RESTRICTED= Redistribution of repackaged binaries not permitted
13NO_SRC_ON_CDROM=${RESTRICTED} 13NO_SRC_ON_CDROM=${RESTRICTED}
14NO_SRC_ON_FTP= ${RESTRICTED} 14NO_SRC_ON_FTP= ${RESTRICTED}
@@ -29,27 +29,27 @@ DIST_ARCH= ${EMUL_ARCH} @@ -29,27 +29,27 @@ DIST_ARCH= ${EMUL_ARCH}
29.endif 29.endif
30 30
31# On DragonFly, this just seems to coredump and/or hang around. 31# On DragonFly, this just seems to coredump and/or hang around.
32NOT_FOR_PLATFORM= DragonFly-*-* 32NOT_FOR_PLATFORM= DragonFly-*-*
33 33
34INTERACTIVE_STAGE= fetch 34INTERACTIVE_STAGE= fetch
35BUILD_DIRS= # empty 35BUILD_DIRS= # empty
36 36
37.include "../../mk/bsd.prefs.mk" 37.include "../../mk/bsd.prefs.mk"
38 38
39JAVA_HOME= ${LOCALBASE}/java/sun-6 39JAVA_HOME= ${LOCALBASE}/java/sun-6
40JAVA_NAME= sun6 40JAVA_NAME= sun6
41JAVA_UNLIMIT= datasize 41JAVA_UNLIMIT= datasize
42JAVA_LD_LIBRARY_PATH= ${JAVA_HOME}/lib/${MACHINE_ARCH}/jli 42JAVA_LD_LIBRARY_PATH= ${JAVA_HOME}/lib/${EMUL_ARCH}/jli
43 43
44MESSAGE_SUBST+= JAVA_HOME=${JAVA_HOME:Q} 44MESSAGE_SUBST+= JAVA_HOME=${JAVA_HOME:Q}
45 45
46EXTRACT_ENV+= HOME=${WRKDIR}/fake_home 46EXTRACT_ENV+= HOME=${WRKDIR}/fake_home
47 47
48# the following forces compression of jarfiles, which is a huge disk 48# the following forces compression of jarfiles, which is a huge disk
49# space win and trivial to no speed reduction in the face of the 49# space win and trivial to no speed reduction in the face of the
50# new class sharing in Java 5+... -tvierling 50# new class sharing in Java 5+... -tvierling
51EXTRACT_ENV+= UNPACK200_FLAGS=-Htrue 51EXTRACT_ENV+= UNPACK200_FLAGS=-Htrue
52 52
53FETCH_MESSAGE+= " The file ${DISTNAME}${EXTRACT_SUFX} containing ${DOWNLOAD_NAME}" 53FETCH_MESSAGE+= " The file ${DISTNAME}${EXTRACT_SUFX} containing ${DOWNLOAD_NAME}"
54FETCH_MESSAGE+= "" 54FETCH_MESSAGE+= ""
55FETCH_MESSAGE+= " must be fetched into:" 55FETCH_MESSAGE+= " must be fetched into:"