pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc support i386 a.out and ELF binary emulation for amd64.
details: https://anonhg.NetBSD.org/pkgsrc/rev/903679faa1f6
branches: trunk
changeset: 487199:903679faa1f6
user: hamajima <hamajima%pkgsrc.org@localhost>
date: Tue Jan 11 05:12:56 2005 +0000
description:
support i386 a.out and ELF binary emulation for amd64.
diffstat:
doc/CHANGES | 4 +++-
emulators/netbsd32_compat14/INSTALL | 11 ++++++-----
emulators/netbsd32_compat14/Makefile | 16 +++++++++++++---
emulators/netbsd32_compat14/PLIST.i386 | 3 +++
emulators/netbsd32_compat14/distinfo | 4 +++-
emulators/netbsd32_compat16/INSTALL | 11 ++++++-----
emulators/netbsd32_compat16/Makefile | 17 +++++++++++++++--
emulators/netbsd32_compat16/PLIST | 28 +---------------------------
emulators/netbsd32_compat16/PLIST.i386 | 23 +++++++++++++++++++++++
emulators/netbsd32_compat16/PLIST.sparc | 27 +++++++++++++++++++++++++++
emulators/netbsd32_compat16/distinfo | 4 +++-
11 files changed, 103 insertions(+), 45 deletions(-)
diffs (286 lines):
diff -r 8a8111e1d554 -r 903679faa1f6 doc/CHANGES
--- a/doc/CHANGES Tue Jan 11 04:34:08 2005 +0000
+++ b/doc/CHANGES Tue Jan 11 05:12:56 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.8690 2005/01/11 04:35:19 kim Exp $
+$NetBSD: CHANGES,v 1.8691 2005/01/11 05:12:56 hamajima Exp $
Changes to the packages collection and infrastructure in 2005:
@@ -227,3 +227,5 @@
Updated gsymcheck to 20041228 [dmcmahill 2005-01-10]
Updated libgeda to 20041228 [dmcmahill 2005-01-10]
Updated leafnode to 1.10.7 [kim 2005-01-11]
+ Updated netbsd32_compat14 to 1.4.3.1nb1 [hamajima 2005-01-11]
+ Updated netbsd32_compat16 to 1.0nb1 [hamajima 2005-01-11]
diff -r 8a8111e1d554 -r 903679faa1f6 emulators/netbsd32_compat14/INSTALL
--- a/emulators/netbsd32_compat14/INSTALL Tue Jan 11 04:34:08 2005 +0000
+++ b/emulators/netbsd32_compat14/INSTALL Tue Jan 11 05:12:56 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.2 2003/08/30 19:07:10 jlam Exp $
+# $NetBSD: INSTALL,v 1.3 2005/01/11 05:12:56 hamajima Exp $
case ${STAGE} in
POST-INSTALL)
@@ -9,10 +9,11 @@
# that sparc64 a.out compatibility lives in /emul/aout, not /emul/netbsd32.
#
create_emul_symlink=0
- if [ "${MACHINE_ARCH}" = "sparc64" ]
- then
- create_emul_symlink=1
- fi
+ case ${MACHINE_ARCH} in
+ sparc64 | x86_64)
+ create_emul_symlink=1
+ ;;
+ esac
if [ ${create_emul_symlink} = 1 ]
then
diff -r 8a8111e1d554 -r 903679faa1f6 emulators/netbsd32_compat14/Makefile
--- a/emulators/netbsd32_compat14/Makefile Tue Jan 11 04:34:08 2005 +0000
+++ b/emulators/netbsd32_compat14/Makefile Tue Jan 11 05:12:56 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/08/30 22:51:16 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/01/11 05:12:56 hamajima Exp $
#
DISTNAME= compat14-${MACHINE32_ARCH}-${VERSION}
@@ -10,16 +10,21 @@
HOMEPAGE= http://www.NetBSD.org/Releases/formal-1.4/index.html
COMMENT= 32-bit shared libraries for NetBSD 1.4 (and earlier) compatibility
-DEPENDS+= netbsd32_compat15>=1.0:../netbsd32_compat15
-
VERSION= 1.4.3.1
+PKGREVISION= 1
.if ${MACHINE_ARCH} == "sparc64"
MACHINE32_ARCH= sparc
+DEPENDS+= netbsd32_compat15>=1.0:../netbsd32_compat15
+.elif ${MACHINE_ARCH} == "x86_64"
+MACHINE32_ARCH= i386
+DEPENDS+= netbsd32_compat16>=1.0:../netbsd32_compat16
.else
MACHINE32_ARCH= ${MACHINE_ARCH}
.endif
+
ONLY_FOR_PLATFORM= NetBSD-*-sparc64
+ONLY_FOR_PLATFORM+= NetBSD-2*-x86_64
NO_MTREE= # defined
NO_BUILD= # defined
@@ -40,6 +45,11 @@
COMPAT_LIBDIR= ${EMULSUBDIR}/usr/lib
COMPAT_XLIBDIR= ${EMULSUBDIR}/usr/X11R6/lib
+PLIST_SRC+= ${PKGDIR}/PLIST
+.if exists(${PKGDIR}/PLIST.${MACHINE32_ARCH})
+PLIST_SRC+= ${PKGDIR}/PLIST.${MACHINE32_ARCH}
+.endif
+
PLIST_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR} COMPAT_XLIBDIR=${COMPAT_XLIBDIR}
do-install:
diff -r 8a8111e1d554 -r 903679faa1f6 emulators/netbsd32_compat14/PLIST.i386
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/netbsd32_compat14/PLIST.i386 Tue Jan 11 05:12:56 2005 +0000
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.i386,v 1.1 2005/01/11 05:12:56 hamajima Exp $
+${COMPAT_LIBDIR}/libi386.so.0.2
+${COMPAT_LIBDIR}/libkeycap.so.0.0
diff -r 8a8111e1d554 -r 903679faa1f6 emulators/netbsd32_compat14/distinfo
--- a/emulators/netbsd32_compat14/distinfo Tue Jan 11 04:34:08 2005 +0000
+++ b/emulators/netbsd32_compat14/distinfo Tue Jan 11 05:12:56 2005 +0000
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.3 2002/08/13 03:06:10 jdarrow Exp $
+$NetBSD: distinfo,v 1.4 2005/01/11 05:12:56 hamajima Exp $
+SHA1 (compat14-i386-1.4.3.1.tar.gz) = 7c00ede3cf18bfc437e9262f0e583bde5f134004
+Size (compat14-i386-1.4.3.1.tar.gz) = 1646083 bytes
SHA1 (compat14-sparc-1.4.3.1.tar.gz) = 9c0e46ced11f1f56fde79158edebb12898ea4ffa
Size (compat14-sparc-1.4.3.1.tar.gz) = 1831758 bytes
diff -r 8a8111e1d554 -r 903679faa1f6 emulators/netbsd32_compat16/INSTALL
--- a/emulators/netbsd32_compat16/INSTALL Tue Jan 11 04:34:08 2005 +0000
+++ b/emulators/netbsd32_compat16/INSTALL Tue Jan 11 05:12:56 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.2 2003/08/30 19:11:57 jlam Exp $
+# $NetBSD: INSTALL,v 1.3 2005/01/11 05:12:56 hamajima Exp $
case ${STAGE} in
POST-INSTALL)
@@ -9,10 +9,11 @@
# that sparc64 a.out compatibility lives in /emul/aout, not /emul/netbsd32.
#
create_emul_symlink=0
- if [ "${MACHINE_ARCH}" = "sparc64" ]
- then
- create_emul_symlink=1
- fi
+ case ${MACHINE_ARCH} in
+ sparc64 | x86_64)
+ create_emul_symlink=1
+ ;;
+ esac
if [ ${create_emul_symlink} = 1 ]
then
diff -r 8a8111e1d554 -r 903679faa1f6 emulators/netbsd32_compat16/Makefile
--- a/emulators/netbsd32_compat16/Makefile Tue Jan 11 04:34:08 2005 +0000
+++ b/emulators/netbsd32_compat16/Makefile Tue Jan 11 05:12:56 2005 +0000
@@ -1,14 +1,21 @@
-# $NetBSD: Makefile,v 1.7 2003/11/23 05:22:34 grant Exp $
+# $NetBSD: Makefile,v 1.8 2005/01/11 05:12:56 hamajima Exp $
#
.if ${MACHINE_ARCH} == "sparc64"
MACHINE32_ARCH= sparc
+.elif ${MACHINE_ARCH} == "x86_64"
+MACHINE32_ARCH= i386
.else
MACHINE32_ARCH= ${MACHINE_ARCH}
.endif
+.if ${MACHINE32_ARCH} == "sparc"
DISTNAME= compat16-${MACHINE32_ARCH}
+.else
+DISTNAME= compat16-${MACHINE32_ARCH}-1.6.0
+.endif
PKGNAME= netbsd32_compat16-1.0
+PKGREVISION= 1
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_LOCAL}
EXTRACT_SUFX= .tar.bz2
@@ -19,7 +26,8 @@
CONFLICTS= netbsd32_compat15-[0-9]*
-ONLY_FOR_PLATFORM= NetBSD-*-sparc64
+ONLY_FOR_PLATFORM= NetBSD-2*-sparc64
+ONLY_FOR_PLATFORM+= NetBSD-2*-x86_64
NO_MTREE= # defined
NO_BUILD= # defined
@@ -40,6 +48,11 @@
COMPAT_LIBEXECDIR= ${PREFIX}/${EMULSUBDIR}/usr/libexec
COMPAT_XLIBDIR= ${PREFIX}/${EMULSUBDIR}/usr/X11R6/lib
+PLIST_SRC+= ${PKGDIR}/PLIST
+.if exists(${PKGDIR}/PLIST.${MACHINE32_ARCH})
+PLIST_SRC+= ${PKGDIR}/PLIST.${MACHINE32_ARCH}
+.endif
+
PLIST_SUBST+= COMPAT_EMULSUBDIR=${EMULSUBDIR}
# XXX using pax to copy symlinks properly.
diff -r 8a8111e1d554 -r 903679faa1f6 emulators/netbsd32_compat16/PLIST
--- a/emulators/netbsd32_compat16/PLIST Tue Jan 11 04:34:08 2005 +0000
+++ b/emulators/netbsd32_compat16/PLIST Tue Jan 11 05:12:56 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/11/08 16:23:02 mrg Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/01/11 05:12:56 hamajima Exp $
${COMPAT_EMULSUBDIR}/usr/lib/libamu.so.2
${COMPAT_EMULSUBDIR}/usr/lib/libamu.so.2.1
${COMPAT_EMULSUBDIR}/usr/lib/libasn1.so.6
@@ -105,31 +105,5 @@
${COMPAT_EMULSUBDIR}/usr/lib/libwrap.so.0.2
${COMPAT_EMULSUBDIR}/usr/lib/libz.so.0
${COMPAT_EMULSUBDIR}/usr/lib/libz.so.0.2
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libICE.so.6
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libICE.so.6.3
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libPEX5.so.6
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libPEX5.so.6.0
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libSM.so.6
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libSM.so.6.0
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libX11.so.6
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libX11.so.6.1
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXIE.so.6
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXIE.so.6.0
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXaw.so.6
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXaw.so.6.1
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXext.so.6
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXext.so.6.3
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXi.so.6
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXi.so.6.0
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXmu.so.6
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXmu.so.6.0
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXp.so.6
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXp.so.6.2
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXt.so.6
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXt.so.6.0
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXtst.so.6
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXtst.so.6.1
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/liboldX.so.6
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/liboldX.so.6.0
${COMPAT_EMULSUBDIR}/usr/libexec/ld.elf_so
${COMPAT_EMULSUBDIR}/usr/libexec/ld.so
diff -r 8a8111e1d554 -r 903679faa1f6 emulators/netbsd32_compat16/PLIST.i386
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/netbsd32_compat16/PLIST.i386 Tue Jan 11 05:12:56 2005 +0000
@@ -0,0 +1,23 @@
+@comment $NetBSD: PLIST.i386,v 1.1 2005/01/11 05:12:56 hamajima Exp $
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libICE.so.6
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libICE.so.6.3
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libSM.so.6
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libSM.so.6.0
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libX11.so.6
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libX11.so.6.2
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXaw.so.6
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXaw.so.6.1
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXext.so.6
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXext.so.6.4
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXi.so.6
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXi.so.6.0
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXmu.so.6
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXmu.so.6.2
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXp.so.6
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXp.so.6.2
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXt.so.6
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXt.so.6.0
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXtst.so.6
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXtst.so.6.1
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/liboldX.so.6
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/liboldX.so.6.0
diff -r 8a8111e1d554 -r 903679faa1f6 emulators/netbsd32_compat16/PLIST.sparc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/netbsd32_compat16/PLIST.sparc Tue Jan 11 05:12:56 2005 +0000
@@ -0,0 +1,27 @@
+@comment $NetBSD: PLIST.sparc,v 1.1 2005/01/11 05:12:56 hamajima Exp $
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libICE.so.6
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libICE.so.6.3
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libPEX5.so.6
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libPEX5.so.6.0
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libSM.so.6
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libSM.so.6.0
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libX11.so.6
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libX11.so.6.1
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXIE.so.6
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXIE.so.6.0
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXaw.so.6
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXaw.so.6.1
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXext.so.6
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXext.so.6.3
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXi.so.6
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXi.so.6.0
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXmu.so.6
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXmu.so.6.0
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXp.so.6
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXp.so.6.2
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXt.so.6
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXt.so.6.0
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXtst.so.6
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXtst.so.6.1
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/liboldX.so.6
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/liboldX.so.6.0
diff -r 8a8111e1d554 -r 903679faa1f6 emulators/netbsd32_compat16/distinfo
--- a/emulators/netbsd32_compat16/distinfo Tue Jan 11 04:34:08 2005 +0000
+++ b/emulators/netbsd32_compat16/distinfo Tue Jan 11 05:12:56 2005 +0000
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/11/08 16:23:02 mrg Exp $
+$NetBSD: distinfo,v 1.2 2005/01/11 05:12:56 hamajima Exp $
SHA1 (compat16-sparc.tar.bz2) = f5cb874b06e2664582bf06680a952cf7bb571aaa
Size (compat16-sparc.tar.bz2) = 2550861 bytes
+SHA1 (compat16-i386-1.6.0.tar.bz2) = 04c2fc19591941bb4ae79a2a909e5871b37dc33a
+Size (compat16-i386-1.6.0.tar.bz2) = 2478593 bytes
Home |
Main Index |
Thread Index |
Old Index