>Number:         16475
>Category:       pkg
>Synopsis:       update pkgsrc/cross/mipsEEel-netbsd
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed Apr 24 03:32:00 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     HAMAJIMA Katsuomi
>Release:        NetBSD 1.5.3
>Organization:
>Environment:
System: NetBSD atom 1.5.3 NetBSD 1.5.3 (ATOM) #47: Tue Apr 23 10:44:57 JST 2002 hamajima@atom:/usr/src/sys/arch/i386/compile/ATOM i386
Architecture: i386
Machine: i386
>Description:
update pkgsrc/cross/mipsEEel-netbsd to Linux for PlayStation2 Release 1.0

>How-To-Repeat:
>Fix:

diff -rcN Makefile.orig Makefile
*** Makefile.orig	Fri Sep 28 08:17:52 2001
--- Makefile	Wed Apr 24 14:38:33 2002
***************
*** 20,30 ****
  #
  # binutils
  #
! MASTER_SITES+=		ftp://ftp.netbsd.org/pub/NetBSD/misc/tshiozak/PlayStation2/GPLed-from-SCEI/binutils-2.9EE/
! DISTFILES+=		binutils-2.9EE.linux.patch.bz2
! BINUTILS_PATCH1=	${_DISTDIR}/binutils-2.9EE.linux.patch.bz2
! DISTFILES+=		binutils-ps2linux-0.9.patch.bz2
! BINUTILS_PATCH2=	${_DISTDIR}/binutils-ps2linux-0.9.patch.bz2
  
  BINUTILS_DISTNAME=	binutils-2.9EE
  BINUTILS_WRKSRC=	${WRKDIR}/${BINUTILS_DISTNAME}
--- 20,28 ----
  #
  # binutils
  #
! MASTER_SITES+=		ftp://ftp.netbsd.org/pub/NetBSD/misc/hamajima/PlayStation2/GPLed-from-SCEI/binutils-2.9EE/
! DISTFILES+=		binutils-ps2linux-1.0.0.patch.bz2
! BINUTILS_PATCH1=	${_DISTDIR}/binutils-ps2linux-1.0.0.patch.bz2
  
  BINUTILS_DISTNAME=	binutils-2.9EE
  BINUTILS_WRKSRC=	${WRKDIR}/${BINUTILS_DISTNAME}
***************
*** 34,49 ****
  #
  # gcc
  #
! MASTER_SITES+=		ftp://ftp.netbsd.org/pub/NetBSD/misc/tshiozak/PlayStation2/GPLed-from-SCEI/gcc-2.95.2EE/
  GCC_VERSION=		2.95.2
  GCC_DISTNAME=		gcc-${GCC_VERSION}
  GCC_WRKSRC=		${WRKDIR}/${GCC_DISTNAME}
  DISTFILES+=		${GCC_DISTNAME}.tar.gz
  EXTRACT_ONLY+=		${GCC_DISTNAME}.tar.gz
! DISTFILES+=		gcc-${GCC_VERSION}.EE-linux.patch.bz2
! GCC_PATCH1=		${_DISTDIR}/gcc-${GCC_VERSION}.EE-linux.patch.bz2
! DISTFILES+=		gcc-ps2linux-0.9.1.patch.bz2
! GCC_PATCH2=		${_DISTDIR}/gcc-ps2linux-0.9.1.patch.bz2
  BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
  BUILD_DEPENDS+=		autoconf-[0-9]*:../../devel/autoconf
  
--- 32,49 ----
  #
  # gcc
  #
! MASTER_SITES+=		ftp://ftp.netbsd.org/pub/NetBSD/misc/hamajima/PlayStation2/GPLed-from-SCEI/gcc-2.95.2EE/
  GCC_VERSION=		2.95.2
  GCC_DISTNAME=		gcc-${GCC_VERSION}
  GCC_WRKSRC=		${WRKDIR}/${GCC_DISTNAME}
  DISTFILES+=		${GCC_DISTNAME}.tar.gz
  EXTRACT_ONLY+=		${GCC_DISTNAME}.tar.gz
! DISTFILES+=		gcc-${GCC_VERSION}-frankengcc-patches.patch.bz2
! GCC_PATCH0=		${_DISTDIR}/gcc-${GCC_VERSION}-frankengcc-patches.patch.bz2
! DISTFILES+=		gcc-${GCC_VERSION}-single-float-const.patch.bz2
! GCC_PATCH1=		${_DISTDIR}/gcc-${GCC_VERSION}-single-float-const.patch.bz2
! DISTFILES+=		gcc-ps2linux-1.0.0.patch.bz2
! GCC_PATCH2=		${_DISTDIR}/gcc-ps2linux-1.0.0.patch.bz2
  BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
  BUILD_DEPENDS+=		autoconf-[0-9]*:../../devel/autoconf
  
***************
*** 56,62 ****
  
  binutils-patch:
  	${BZCAT} ${BINUTILS_PATCH1} | ${PATCH} -d ${BINUTILS_WRKSRC} --forward --quiet -p1 -E
- 	${BZCAT} ${BINUTILS_PATCH2} | ${PATCH} -d ${BINUTILS_WRKSRC} --forward --quiet -p1 -E
  	for i in patches/binutils-*; do \
  		${PATCH} -d ${BINUTILS_WRKSRC} --forward --quiet -E < $$i; \
  	done
--- 56,61 ----
***************
*** 74,79 ****
--- 73,79 ----
  
  
  gcc-patch:
+ 	${BZCAT} ${GCC_PATCH0} | ${PATCH} -d ${GCC_WRKSRC} --forward --quiet -p1 -E
  	${BZCAT} ${GCC_PATCH1} | ${PATCH} -d ${GCC_WRKSRC} --forward --quiet -p1 -E
  	${BZCAT} ${GCC_PATCH2} | ${PATCH} -d ${GCC_WRKSRC} --forward --quiet -p1 -E
  	for i in patches/gcc-*; do \
***************
*** 89,98 ****
  	-${RM} ${GCC_WRKSRC}/obj/texinfo/makeinfo/Makefile
  
  gcc-build:
! 	-${RM} ${GCC_WRKSRC}/obj/gcc/as
! 	-${RM} ${GCC_WRKSRC}/obj/gcc/ld
! 	${LN} -s ${BINUTILS_WRKSRC}/obj/gas/as-new ${GCC_WRKSRC}/obj/gcc/as
! 	${LN} -s ${BINUTILS_WRKSRC}/obj/ld/ld-new ${GCC_WRKSRC}/obj/gcc/ld
  	${GMAKE} -C ${GCC_WRKSRC}/obj/libiberty
  #	${GMAKE} -C ${GCC_WRKSRC}/obj/texinfo
  	${GMAKE} -C ${GCC_WRKSRC}/obj/gcc LIBGCC="" LIBGCC1_TEST="" INSTALL_LIBGCC=""
--- 89,96 ----
  	-${RM} ${GCC_WRKSRC}/obj/texinfo/makeinfo/Makefile
  
  gcc-build:
! 	${LN} -sf ${BINUTILS_WRKSRC}/obj/gas/as-new ${GCC_WRKSRC}/obj/gcc/as
! 	${LN} -sf ${BINUTILS_WRKSRC}/obj/ld/ld-new ${GCC_WRKSRC}/obj/gcc/ld
  	${GMAKE} -C ${GCC_WRKSRC}/obj/libiberty
  #	${GMAKE} -C ${GCC_WRKSRC}/obj/texinfo
  	${GMAKE} -C ${GCC_WRKSRC}/obj/gcc LIBGCC="" LIBGCC1_TEST="" INSTALL_LIBGCC=""
diff -rcN PLIST.orig PLIST
*** PLIST.orig	Thu Nov  1 07:03:38 2001
--- PLIST	Wed Apr 24 02:28:11 2002
***************
*** 120,125 ****
--- 120,126 ----
  ${SUBDIR}/${TARGET_ARCH}/lib/ldscripts/mipslit.xu
  @dirrm ${SUBDIR}/bin
  @dirrm ${SUBDIR}/include
+ @dirrm ${SUBDIR}/info
  @dirrm ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}/include
  @dirrm ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}
  @dirrm ${SUBDIR}/lib/gcc-lib/${TARGET_ARCH}
***************
*** 131,134 ****
--- 132,136 ----
  @dirrm ${SUBDIR}/${TARGET_ARCH}/lib/ldscripts
  @dirrm ${SUBDIR}/${TARGET_ARCH}/lib
  @dirrm ${SUBDIR}/${TARGET_ARCH}
+ @dirrm ${SUBDIR}/share
  @dirrm ${SUBDIR}
diff -rcN distinfo.orig distinfo
*** distinfo.orig	Mon Aug  6 00:28:41 2001
--- distinfo	Wed Apr 24 02:28:11 2002
***************
*** 1,14 ****
  $NetBSD$
  
! SHA1 (binutils-2.9EE.linux.patch.bz2) = 9b8af1ca94cbb6731fc283509d420b9ca35a7658
! Size (binutils-2.9EE.linux.patch.bz2) = 292104 bytes
! SHA1 (binutils-ps2linux-0.9.patch.bz2) = 29283f4fe7f450a69495a0da80c44eb28377088d
! Size (binutils-ps2linux-0.9.patch.bz2) = 19123 bytes
  SHA1 (binutils-2.9EE.tar.gz) = 541c6815446b091ca17405127602b3673dc84fc8
  Size (binutils-2.9EE.tar.gz) = 7199214 bytes
  SHA1 (gcc-2.95.2.tar.gz) = c3da103de3fa97c78ccc1b4fdc29fa25bf26a6c8
  Size (gcc-2.95.2.tar.gz) = 12885815 bytes
! SHA1 (gcc-2.95.2.EE-linux.patch.bz2) = df5ee1b60219a1d1f7c073751571554888028b18
! Size (gcc-2.95.2.EE-linux.patch.bz2) = 220838 bytes
! SHA1 (gcc-ps2linux-0.9.1.patch.bz2) = 2dd428fc45d2aafafe7bbd479012fbff29fbc07c
! Size (gcc-ps2linux-0.9.1.patch.bz2) = 612196 bytes
--- 1,14 ----
  $NetBSD$
  
! SHA1 (binutils-ps2linux-1.0.0.patch.bz2) = 965761594a12eeb880a93d94ff25167f73589658
! Size (binutils-ps2linux-1.0.0.patch.bz2) = 314714 bytes
  SHA1 (binutils-2.9EE.tar.gz) = 541c6815446b091ca17405127602b3673dc84fc8
  Size (binutils-2.9EE.tar.gz) = 7199214 bytes
  SHA1 (gcc-2.95.2.tar.gz) = c3da103de3fa97c78ccc1b4fdc29fa25bf26a6c8
  Size (gcc-2.95.2.tar.gz) = 12885815 bytes
! SHA1 (gcc-2.95.2-frankengcc-patches.patch.bz2) = fe13882ab97f66c65cfc55b117a49827815fe486
! Size (gcc-2.95.2-frankengcc-patches.patch.bz2) = 1300 bytes
! SHA1 (gcc-2.95.2-single-float-const.patch.bz2) = e673dd3c15dd90b790e83e328c37424e482d029a
! Size (gcc-2.95.2-single-float-const.patch.bz2) = 1429 bytes
! SHA1 (gcc-ps2linux-1.0.0.patch.bz2) = afb4b93d0116b1dfd35da59258df441d57863b0a
! Size (gcc-ps2linux-1.0.0.patch.bz2) = 819901 bytes
diff -rcN patches/binutils-ae.orig patches/binutils-ae
*** patches/binutils-ae.orig	Thu Jan  1 09:00:00 1970
--- patches/binutils-ae	Wed Apr 24 15:57:41 2002
***************
*** 0 ****
--- 1,16 ----
+ $NetBSD$
+ 
+ --- config.sub.orig	Wed Apr 24 15:22:48 2002
+ +++ config.sub
+ @@ -952,6 +952,11 @@
+   		basic_machine=c4x-none
+   		os=-coff
+    		;;
+ +	algor-* | arc-* | cobalt-* | hpcmips-* | playstation2-* | pmax-*)
+ +		if [ x$os = x-netbsd ]; then
+ +			basic_machine=mipsel-unknown
+ +		fi
+ +		;;
+  	*)
+  		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+  		exit 1
diff -rcN patches/gcc-aa.orig patches/gcc-aa
*** patches/gcc-aa.orig	Mon Aug  6 00:28:41 2001
--- patches/gcc-aa	Wed Apr 24 15:58:20 2002
***************
*** 1,11 ****
  $NetBSD$
  
! --- gcc/configure.hoge	Thu Aug  2 23:14:48 2001
  +++ gcc/configure
! @@ -4686,6 +4686,15 @@
   		# On NetBSD, the headers are already okay, except for math.h.
   		tmake_file=t-netbsd
!  		;;
  +	mipsEEel-*-netbsd*)			# for NetBSD/PlayStation2, incomplete!!
  +		xmake_file=x-linux		# Oops
  +		xm_file="xm-siglist.h ${xm_file}"
--- 1,27 ----
  $NetBSD$
  
! --- gcc/configure.orig	Wed Apr 24 15:23:36 2002
  +++ gcc/configure
! @@ -2947,6 +2947,10 @@
!  	sparc*-*-*)
!  		cpu_type=sparc
!  		;;
! +	algor-*-netbsd* | arc-*-netbsd* | cobalt-*-netbsd* | hpcmips-*-netbsd* | playstation2-*-netbsd* | pmax-*-netbsd*)
! +		cpu_type=mips
! +		machine=mipsel-unknown-netbsd
! +		;;
!  	esac
!  
!  	tm_file=${cpu_type}/${cpu_type}.h
! @@ -4682,9 +4686,19 @@
!  	      fi
!  	      ;;
!  	mipsel-*-netbsd* | mips-dec-netbsd*)    # Decstation running NetBSD
! +		xmake_file=x-netbsd
!  		tm_file=mips/netbsd.h
   		# On NetBSD, the headers are already okay, except for math.h.
   		tmake_file=t-netbsd
! +		;;
  +	mipsEEel-*-netbsd*)			# for NetBSD/PlayStation2, incomplete!!
  +		xmake_file=x-linux		# Oops
  +		xm_file="xm-siglist.h ${xm_file}"
***************
*** 14,20 ****
  +		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
  +		gnu_ld=yes
  +		gas=yes
! +		;;
   	mipsEE*-*-linux*)		# MIPS EE w/ Linux & ELF
   		xmake_file=x-linux
-  		xm_file="xm-siglist.h ${xm_file}"
--- 30,35 ----
  +		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
  +		gnu_ld=yes
  +		gas=yes
!  		;;
   	mipsEE*-*-linux*)		# MIPS EE w/ Linux & ELF
   		xmake_file=x-linux
diff -rcN patches/gcc-ad.orig patches/gcc-ad
*** patches/gcc-ad.orig	Thu Jan  1 09:00:00 1970
--- patches/gcc-ad	Wed Apr 24 15:58:53 2002
***************
*** 0 ****
--- 1,16 ----
+ $NetBSD$
+ 
+ --- config.sub.orig	Wed Apr 24 15:23:34 2002
+ +++ config.sub
+ @@ -880,6 +880,11 @@
+   		basic_machine=c4x-none
+   		os=-coff
+    		;;
+ +	algor-* | arc-* | cobalt-* | hpcmips-* | playstation2-* | pmax-*)
+ +		if [ x$os = x-netbsd ]; then
+ +			basic_machine=mipsel-unknown
+ +		fi
+ +		;;
+  	*)
+  		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+  		exit 1
>Release-Note:
>Audit-Trail:
>Unformatted: