diff options
author | tv <tv> | 1999-01-04 22:37:29 +0000 |
---|---|---|
committer | tv <tv> | 1999-01-04 22:37:29 +0000 |
commit | 1ac8c0ae893cce269b1164bb0d5d075a4e36279b (patch) | |
tree | f6d6b811a4c9cc20cd3b49a70a233e6958d1095b /cross/i386-msdosdjgpp | |
parent | 531eb73376adf514ac2b79ec993c9774230ed45b (diff) | |
download | pkgsrc-1ac8c0ae893cce269b1164bb0d5d075a4e36279b.tar.gz |
Major `cross' category overhaul. Clean up the shared Makefiles; move all
binutils stuff (except gas) to a shared, multiple-target binutils build;
reduce extract and compile times by being more specific with files and
targets; update to egcs 1.1.1 with a diffball from NetBSD's src/gnu/dist
tree; add 4.4BSD a.out archive support to binutils.
Diffstat (limited to 'cross/i386-msdosdjgpp')
-rw-r--r-- | cross/i386-msdosdjgpp/Makefile | 40 | ||||
-rw-r--r-- | cross/i386-msdosdjgpp/files/md5 | 7 | ||||
-rw-r--r-- | cross/i386-msdosdjgpp/patches/patch-aa | 13 | ||||
-rw-r--r-- | cross/i386-msdosdjgpp/patches/patch-ab | 19 | ||||
-rw-r--r-- | cross/i386-msdosdjgpp/pkg/PLIST | 10 |
5 files changed, 45 insertions, 44 deletions
diff --git a/cross/i386-msdosdjgpp/Makefile b/cross/i386-msdosdjgpp/Makefile index a0ca7dca2ab..6cf1aac2a0e 100644 --- a/cross/i386-msdosdjgpp/Makefile +++ b/cross/i386-msdosdjgpp/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.5 1998/08/26 19:35:37 tv Exp $ +# $NetBSD: Makefile,v 1.6 1999/01/04 22:37:33 tv Exp $ # -DISTVERSION= 2.01.1 +DISTVERSION= 2.02.0 DISTFILES= ${DJGPP_FILES} EXTRACT_ONLY= # none of the djgpp files MASTER_SITES= ftp://ftp.simtel.net/pub/simtelnet/gnu/djgpp/v2/ \ @@ -12,40 +12,44 @@ HOMEPAGE= http://www.delorie.com/djgpp/ BUILD_DEPENDS= unzip:../../archivers/unzip -USE_CROSS_GNU= yes +WRKSRC= ${WRKDIR}/djgpp -DJGPP_FILES= djcrx201.zip wmemu2b.zip +USE_CROSS_BINUTILS= yes +BINUTILS_GNUTARGET= coff-go32 +BINUTILS_LDEMULATION= i386go32 +USE_CROSS_EGCS= yes + +DJGPP_FILES= djcrx202.zip wmemu2b.zip TARGET_ARCH= i386-msdosdjgpp -SYS_INCLUDE= ${WRKDIR}/djgpp/include -SYS_LIB= ${WRKDIR}/djgpp/lib +SYS_INCLUDE= ${WRKSRC}/include +SYS_LIB= ${WRKSRC}/lib post-extract: - @${MKDIR} ${WRKDIR}/djgpp - @cd ${WRKDIR}/djgpp; \ + @${MKDIR} ${WRKSRC} + @cd ${WRKSRC}; \ for file in ${DJGPP_FILES}; do \ unzip -Loq ${_DISTDIR}/$$file; \ done; \ - echo 'Stripping CR-LF in includes...'; \ for file in `find include -type f`; do \ ${CAT} $$file | col >$$file.new; \ ${MV} -f $$file.new $$file; \ done - @${LN} -f ${SYS_LIB}/crt0.o ${WRKSRC}/gcc/ + @${LN} -f ${SYS_LIB}/crt0.o ${EGCS_WRKSRC}/gcc/ @${RM} -f ${SYS_LIB}/djgpp.djl ${SYS_LIB}/specs post-patch: - @${RM} -f ${SYS_INCLUDE}/sys/djtypes.h.orig + @${RM} -f ${SYS_INCLUDE}/sys/*.orig -post-build: - cd ${WRKDIR}/djgpp/src/stub && ${LINK.c} -o stubedit stubedit.c - cd ${WRKDIR}/djgpp/src/stub && ${LINK.c} -o stubify stubify.c +do-build: + cd ${WRKSRC}/src/stub && ${LINK.c} -o stubedit stubedit.c + cd ${WRKSRC}/src/stub && ${LINK.c} -o stubify stubify.c -post-install: - ${INSTALL_PROGRAM} ${WRKDIR}/djgpp/src/stub/stubedit ${TARGET_DIR}/bin/ +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/src/stub/stubedit ${TARGET_DIR}/bin/ ${LN} -f ${TARGET_DIR}/bin/stubedit ${PREFIX}/bin/${TARGET_ARCH}-stubedit - ${INSTALL_PROGRAM} ${WRKDIR}/djgpp/src/stub/stubify ${TARGET_DIR}/bin/ + ${INSTALL_PROGRAM} ${WRKSRC}/src/stub/stubify ${TARGET_DIR}/bin/ ${LN} -f ${TARGET_DIR}/bin/stubedit ${PREFIX}/bin/${TARGET_ARCH}-stubify - ${INSTALL_DATA} ${WRKDIR}/djgpp/bin/wmemu387.dxe ${TARGET_DIR}/lib/ + ${INSTALL_DATA} ${WRKSRC}/bin/wmemu387.dxe ${TARGET_DIR}/lib/ .include "../COMMON/cross.mk" diff --git a/cross/i386-msdosdjgpp/files/md5 b/cross/i386-msdosdjgpp/files/md5 index a98bb40a69b..12936425049 100644 --- a/cross/i386-msdosdjgpp/files/md5 +++ b/cross/i386-msdosdjgpp/files/md5 @@ -1,7 +1,6 @@ -$NetBSD: md5,v 1.1 1998/08/12 12:30:59 tv Exp $ +$NetBSD: md5,v 1.2 1999/01/04 22:37:33 tv Exp $ -MD5 (csdpmi4b.zip) = ef5ecf6cb7911a12bade9b2081ce82ab -MD5 (djcrx201.zip) = 384d9b738457892fe35cdee159a425ee +MD5 (djcrx202.zip) = 109544675694dcf8ea2511e5942eaf44 MD5 (wmemu2b.zip) = 463860356d5d7a48777f606dbae95b91 +MD5 (egcs-1.1.1.tar.gz) = 0b3f0e856dcbb2241c183081fc7271af MD5 (binutils-2.9.1.tar.gz) = 8f9ad1a6e96742fd3069479171a63c22 -MD5 (egcs-19980803.tar.gz) = 3c6e28dd25140187e322c890231bfc72 diff --git a/cross/i386-msdosdjgpp/patches/patch-aa b/cross/i386-msdosdjgpp/patches/patch-aa deleted file mode 100644 index 0af0e12301b..00000000000 --- a/cross/i386-msdosdjgpp/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.1 1998/08/12 12:30:59 tv Exp $ - ---- ld/scripttempl/i386go32.sc.orig Sun Aug 2 15:02:47 1998 -+++ ld/scripttempl/i386go32.sc Sun Aug 2 15:02:59 1998 -@@ -27,8 +27,6 @@ - ${RELOCATING+ edata = . ; _edata = .}; - ${RELOCATING+ . = ALIGN(${SEGMENT_SIZE});} - } -- ${CONSTRUCTING+${RELOCATING-.ctor : { *(.ctor) }}} -- ${CONSTRUCTING+${RELOCATING-.dtor : { *(.dtor) }}} - .bss ${RELOCATING+ SIZEOF(.data) + ADDR(.data)} : - { - *(.bss) diff --git a/cross/i386-msdosdjgpp/patches/patch-ab b/cross/i386-msdosdjgpp/patches/patch-ab index 714aa58f398..aca3ffd39dc 100644 --- a/cross/i386-msdosdjgpp/patches/patch-ab +++ b/cross/i386-msdosdjgpp/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.2 1998/08/13 13:30:57 tv Exp $ +$NetBSD: patch-ab,v 1.3 1999/01/04 22:37:34 tv Exp $ ---- ../djgpp/include/sys/djtypes.h.orig Mon Aug 3 09:21:37 1998 -+++ ../djgpp/include/sys/djtypes.h Mon Aug 3 09:36:57 1998 -@@ -2,15 +2,21 @@ +--- include/sys/djtypes.h.orig Sun Jan 3 15:57:01 1999 ++++ include/sys/djtypes.h Sun Jan 3 15:57:51 1999 +@@ -3,22 +3,28 @@ #ifndef __DJ_sys_djtypes_h_ #define __DJ_sys_djtypes_h_ @@ -22,8 +22,15 @@ $NetBSD: patch-ab,v 1.2 1998/08/13 13:30:57 tv Exp $ #define __DJ_time_t typedef unsigned int time_t; #define __DJ_uid_t typedef int uid_t; -#define __DJ_va_list typedef void *va_list; --#define __DJ_wchar_t typedef int wchar_t; +#define __DJ_va_list /* provided by gcc stddef.h */ -+#define __DJ_wchar_t /* provided by gcc stddef.h */ + #if defined(__cplusplus) && ( (__GNUC_MINOR__ >= 8 && __GNUC__ == 2 ) || __GNUC__ >= 3 ) + /* wchar_t is now a keyword in C++ */ + #define __DJ_wchar_t + #else + /* but remains a typedef in C */ +-#define __DJ_wchar_t typedef int wchar_t; ++#define __DJ_wchar_t /* provided by gcc stddef.h */ #endif + + #define __DJ_wint_t typedef int wint_t; diff --git a/cross/i386-msdosdjgpp/pkg/PLIST b/cross/i386-msdosdjgpp/pkg/PLIST index e79f5a5d06f..277bd8ea5f4 100644 --- a/cross/i386-msdosdjgpp/pkg/PLIST +++ b/cross/i386-msdosdjgpp/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 1998/08/12 12:31:00 tv Exp $ +@comment $NetBSD: PLIST,v 1.2 1999/01/04 22:37:34 tv Exp $ ${TARGET_ARCH}/bin/stubedit ${TARGET_ARCH}/bin/stubify ${TARGET_ARCH}/include/_ansi @@ -28,11 +28,12 @@ ${TARGET_ARCH}/include/flexlexe.h ${TARGET_ARCH}/include/float.h ${TARGET_ARCH}/include/fnmatch.h ${TARGET_ARCH}/include/ftw.h -${TARGET_ARCH}/include/getpages.h +${TARGET_ARCH}/include/getpagesize.h ${TARGET_ARCH}/include/glob.h ${TARGET_ARCH}/include/go32.h ${TARGET_ARCH}/include/gppconio.h ${TARGET_ARCH}/include/grp.h +${TARGET_ARCH}/include/ieeefp.h ${TARGET_ARCH}/include/inlines/_inline ${TARGET_ARCH}/include/inlines/ctype.ha ${TARGET_ARCH}/include/inlines/ctype.hd @@ -107,12 +108,14 @@ ${TARGET_ARCH}/include/sys/param.h ${TARGET_ARCH}/include/sys/resource.h ${TARGET_ARCH}/include/sys/segments.h ${TARGET_ARCH}/include/sys/stat.h +${TARGET_ARCH}/include/sys/sysmacros.h ${TARGET_ARCH}/include/sys/system.h ${TARGET_ARCH}/include/sys/time.h ${TARGET_ARCH}/include/sys/timeb.h ${TARGET_ARCH}/include/sys/times.h ${TARGET_ARCH}/include/sys/types.h ${TARGET_ARCH}/include/sys/utsname.h +${TARGET_ARCH}/include/sys/version.h ${TARGET_ARCH}/include/sys/vfs.h ${TARGET_ARCH}/include/sys/wait.h ${TARGET_ARCH}/include/termios.h @@ -122,6 +125,8 @@ ${TARGET_ARCH}/include/unistd.h ${TARGET_ARCH}/include/utime.h ${TARGET_ARCH}/include/values.h ${TARGET_ARCH}/include/varargs.h +${TARGET_ARCH}/include/wchar.h +${TARGET_ARCH}/include/wctype.h ${TARGET_ARCH}/lib/crt0.o ${TARGET_ARCH}/lib/dxe.ld ${TARGET_ARCH}/lib/gcrt0.o @@ -129,7 +134,6 @@ ${TARGET_ARCH}/lib/libc.a ${TARGET_ARCH}/lib/libdbg.a ${TARGET_ARCH}/lib/libemu.a ${TARGET_ARCH}/lib/libg.a -${TARGET_ARCH}/lib/libgcc.a ${TARGET_ARCH}/lib/libm.a ${TARGET_ARCH}/lib/libpc.a ${TARGET_ARCH}/lib/libwmemu.a |