pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/cross/i386-mingw32 Update MinGW to 3.2 with gcc-3.3.3,...
details: https://anonhg.NetBSD.org/pkgsrc/rev/6c33356c95b3
branches: trunk
changeset: 470740:6c33356c95b3
user: kent <kent%pkgsrc.org@localhost>
date: Thu Mar 11 18:07:09 2004 +0000
description:
Update MinGW to 3.2 with gcc-3.3.3, binutils-2.15.90, and w32api-2.5.
Fixes PR pkg/19167
diffstat:
cross/i386-mingw32/Makefile | 95 ++---
cross/i386-mingw32/PLIST | 546 +++++++++++++++++++++++++----------
cross/i386-mingw32/distinfo | 24 +-
cross/i386-mingw32/files/config.h | 39 --
cross/i386-mingw32/patches/patch-aa | 22 +-
5 files changed, 444 insertions(+), 282 deletions(-)
diffs (truncated from 1074 to 300 lines):
diff -r c7ccbd2da59b -r 6c33356c95b3 cross/i386-mingw32/Makefile
--- a/cross/i386-mingw32/Makefile Thu Mar 11 18:03:49 2004 +0000
+++ b/cross/i386-mingw32/Makefile Thu Mar 11 18:07:09 2004 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2004/01/22 07:54:07 grant Exp $
+# $NetBSD: Makefile,v 1.18 2004/03/11 18:07:09 kent Exp $
-DISTNAME= cross-${TARGET_ARCH}-1.2
-PKGREVISION= 3
+DISTNAME= cross-${TARGET_ARCH}-3.2
CROSS_DISTFILES=
MAINTAINER= tech-pkg%NetBSD.org@localhost
HOMEPAGE= http://www.mingw.org/
@@ -13,17 +12,20 @@
TARGET_DIR= ${PREFIX}/${TARGET_ARCH}
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mingw/}
-CROSS_DISTFILES+= binutils-2.11.92-20011113-src.tar.gz
-BINUTILS_WRKSRC= ${WRKDIR}/binutils-2.11.92-20011113
+CROSS_DISTFILES+= binutils-2.15.90-20040222-1-src.tar.gz
+BINUTILS_WRKSRC= ${WRKDIR}/binutils-2.15.90-20040222-1
BINUTILS_EXTRAS= dlltool dllwrap windres
-CROSS_DISTFILES+= gcc-2.95.3-20011106-src.tar.gz
-GCC_WRKSRC= ${WRKDIR}/gcc-2.95.3-20011106
-GCC_VERSION= 2.95.3-7
+GCC_VERSION= 3.3.3
+CROSS_DISTFILES+= gcc-${GCC_VERSION}.tar.gz gcc-3.3.3-20040217-1-src.diff.gz \
+ gcc-g++-3.3.3-20040217-1.tar.gz
+MASTER_SITES+= ${MASTER_SITE_GNU:=gcc/releases/gcc-3.3.3/}
+GCC_WIN32_PATCH= ${WRKDIR}/gcc-3.3.3-20040217-1-src.diff
+GCC_WRKSRC= ${WRKDIR}/gcc-${GCC_VERSION}
PLIST_SUBST+= GCC_VERSION=${GCC_VERSION}
-CROSS_DISTFILES+= mingw-runtime-1.2-src.tar.gz
-MINGW_WRKSRC= ${WRKDIR}/mingw-runtime-1.2
-CROSS_DISTFILES+= w32api-1.2-src.tar.gz
-W32_WRKSRC= ${WRKDIR}/w32api-1.2
+CROSS_DISTFILES+= mingw-runtime-3.2.tar.gz
+MINGW_WRKSRC= ${WRKDIR}/mingw-runtime-3.2
+CROSS_DISTFILES+= w32api-2.5.tar.gz
+W32_WRKSRC= ${WRKDIR}/w32api-2.5
USE_GNU_TOOLS+= make
USE_PERL5= build
@@ -35,7 +37,7 @@
LD_FOR_TARGET= ${BINUTILS_WRKSRC}/ld/ld-new
CC_FOR_TARGET= ${GCC_WRKSRC}/${TARGET_ARCH}/gcc/xgcc \
-B${GCC_WRKSRC}/${TARGET_ARCH}/gcc/ ${CFLAGS_FOR_TARGET} \
- -I${MINGW_WRKSRC}/include -I${W32_WRKSRC}/include -L${W32_WRKSRC}/lib
+ -I${WRKSRC}/include -L${WRKSRC}/lib
CXX_FOR_TARGET= ${CC_FOR_TARGET}
GCC_MAKE_FLAGS= \
CC_FOR_TARGET="${CC_FOR_TARGET}" \
@@ -59,6 +61,9 @@
DISTFILES+= ${CROSS_DISTFILES}
+post-extract:
+ -${PATCH} -d ${GCC_WRKSRC} -p1 --forward --quiet -E < ${GCC_WIN32_PATCH}
+
do-configure: bu-configure gcc-configure
bu-configure:
cd ${BINUTILS_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./configure \
@@ -67,32 +72,18 @@
-${MKDIR} ${GCC_WRKSRC}/${TARGET_ARCH}
cd ${GCC_WRKSRC}/${TARGET_ARCH} && ${SETENV} ${CONFIGURE_ENV} ../configure \
--prefix=${PREFIX} --target=${TARGET_ARCH} \
- --with-gnu-as --with-gnu-ld --disable-multilib --disable-nls
- -${MKDIR} ${GCC_WRKSRC}/${TARGET_ARCH}/${TARGET_ARCH}/libiberty
- cd ${GCC_WRKSRC}/${TARGET_ARCH}/${TARGET_ARCH}/libiberty && ${SETENV} \
- ${CONFIGURE_ENV} ../../../libiberty/configure \
- --prefix=${PREFIX} --target=${TARGET_ARCH} --disable-nls
- ${CP} ${FILESDIR}/config.h ${GCC_WRKSRC}/${TARGET_ARCH}/${TARGET_ARCH}/libiberty
+ --with-gnu-as --with-gnu-ld --disable-multilib --disable-nls \
+ --enable-sjlj-exceptions \
+ --with-gxx-include-dir=${TARGET_DIR}/include/c++/${GCC_VERSION}
-do-build: bu-build gcc-build w32-build mingw-build
-bu-build:
+do-build:
cd ${BINUTILS_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS}
-gcc-build:
@${LN} -sf ${AS_FOR_TARGET} ${GCC_WRKSRC}/${TARGET_ARCH}/gcc/as
@${LN} -sf ${LD_FOR_TARGET} ${GCC_WRKSRC}/${TARGET_ARCH}/gcc/ld
cd ${GCC_WRKSRC}/${TARGET_ARCH} && ${SETENV} ${MAKE_ENV} \
- ${MAKE_PROGRAM} ${MAKE_FLAGS} ${GCC_MAKE_FLAGS}
-w32-build:
- cd ${W32_WRKSRC} && ${SETENV} ${TARGET_CONFIGURE_ENV} ${CONFIGURE_ENV} \
- ./configure --target=${TARGET_ARCH}
- cd ${W32_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS}
-mingw-build:
- cd ${MINGW_WRKSRC} && ${SETENV} ${TARGET_CONFIGURE_ENV} ${CONFIGURE_ENV} \
- ./configure --target=${TARGET_ARCH}
- cd ${MINGW_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS}
+ ${MAKE_PROGRAM} ${MAKE_FLAGS} ${GCC_MAKE_FLAGS} all-gcc
-
-do-install: bu-install gcc-install w32-install mingw-install
+do-install: bu-install gcc-install mingw-install
bu-install:
${INSTALL_PROGRAM_DIR} ${TARGET_DIR}/bin
${INSTALL_PROGRAM_DIR} ${PREFIX}/bin
@@ -111,34 +102,20 @@
@cd ${GCC_WRKSRC}/${TARGET_ARCH}/gcc && ${SETENV} ${MAKE_ENV} \
${MAKE_PROGRAM} ${MAKE_FLAGS} ${GCC_MAKE_FLAGS} \
install-common install-headers install-libgcc install-driver
- @${MKDIR} ${TARGET_DIR}/include/g++-3
- @${MKDIR} ${TARGET_DIR}/include/g++-3/std
- ${INSTALL_DATA_DIR} ${TARGET_DIR}/lib
- @cd ${GCC_WRKSRC}/${TARGET_ARCH} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \
- ${MAKE_FLAGS} ${GCC_MAKE_FLAGS} prefix="${TARGET_DIR}" \
- tooldir="${TARGET_DIR}" \
- libsubdir="${PREFIX}/lib/gcc-lib/${TARGET_ARCH}/${GCC_VERSION}" \
- install-target-libstdc++
- for file in c++ c++filt g++; do \
+ for file in c++ g++; do \
${LN} -f ${PREFIX}/bin/${TARGET_ARCH}-$$file ${TARGET_DIR}/bin/$$file; \
done
-w32-install:
- ${INSTALL_DATA_DIR} ${TARGET_DIR}/include
- ${INSTALL_DATA} ${W32_WRKSRC}/include/*.h ${TARGET_DIR}/include
- ${INSTALL_DATA_DIR} ${TARGET_DIR}/lib
- ${INSTALL_DATA} ${W32_WRKSRC}/lib/lib*.a ${TARGET_DIR}/lib
+ ${RM} ${PREFIX}/bin/${TARGET_ARCH}-gcj
mingw-install:
- ${INSTALL_DATA_DIR} ${TARGET_DIR}/include/sys
- ${INSTALL_DATA} ${MINGW_WRKSRC}/include/*.h ${TARGET_DIR}/include
- ${INSTALL_DATA} ${MINGW_WRKSRC}/include/sys/*.h ${TARGET_DIR}/include/sys
- for file in libcrtdll libmsvcrt libmsvcrt20 libmsvcrt40 libmingw32 \
- libcoldname libmoldname libm libmingwthrd profile/libgmon ; do \
- ${INSTALL_DATA} ${MINGW_WRKSRC}/$$file.a ${TARGET_DIR}/lib; \
- done
- ${INSTALL_DATA} ${MINGW_WRKSRC}/mingwm10.dll ${TARGET_DIR}/lib
- for file in crt1 dllcrt1 crt2 dllcrt2 CRT_noglob crtmt crtst \
- profile/gcrt1 profile/gcrt2; do \
- ${INSTALL_DATA} ${MINGW_WRKSRC}/$$file.o ${TARGET_DIR}/lib; \
- done
+ ${INSTALL_DATA_DIR} ${TARGET_DIR}/include
+ cd ${WRKSRC}/include && ${TAR} cf - * | ${TAR} xf - -C ${TARGET_DIR}/include
+ ${MV} ${TARGET_DIR}/include/c++/${GCC_VERSION}/mingw32 \
+ ${TARGET_DIR}/include/c++/${GCC_VERSION}/i386-mingw32
+ ${CHMOD} a-wx `${FIND} ${TARGET_DIR}/include -type f`
+ ${CHMOD} a-w `${FIND} ${TARGET_DIR}/include -type d`
+ ${INSTALL_DATA_DIR} ${TARGET_DIR}/lib
+ -rm -r ${WRKSRC}/lib/gcc-lib
+ ${INSTALL_DATA} ${WRKSRC}/lib/* ${TARGET_DIR}/lib
+ ${INSTALL_DATA} ${WRKSRC}/bin/mingwm10.dll ${TARGET_DIR}/lib
.include "../../mk/bsd.pkg.mk"
diff -r c7ccbd2da59b -r 6c33356c95b3 cross/i386-mingw32/PLIST
--- a/cross/i386-mingw32/PLIST Thu Mar 11 18:03:49 2004 +0000
+++ b/cross/i386-mingw32/PLIST Thu Mar 11 18:07:09 2004 +0000
@@ -1,13 +1,14 @@
-@comment $NetBSD: PLIST,v 1.3 2002/04/05 18:55:26 kent Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/03/11 18:07:09 kent Exp $
bin/i386-mingw32-addr2line
bin/i386-mingw32-ar
bin/i386-mingw32-as
bin/i386-mingw32-c++
-bin/i386-mingw32-c++filt
bin/i386-mingw32-dlltool
bin/i386-mingw32-dllwrap
bin/i386-mingw32-g++
bin/i386-mingw32-gcc
+bin/i386-mingw32-gcc-${GCC_VERSION}
+bin/i386-mingw32-gccbug
bin/i386-mingw32-ld
bin/i386-mingw32-nm
bin/i386-mingw32-objcopy
@@ -21,7 +22,6 @@
i386-mingw32/bin/ar
i386-mingw32/bin/as
i386-mingw32/bin/c++
-i386-mingw32/bin/c++filt
i386-mingw32/bin/dlltool
i386-mingw32/bin/dllwrap
i386-mingw32/bin/g++
@@ -35,14 +35,205 @@
i386-mingw32/bin/strings
i386-mingw32/bin/strip
i386-mingw32/bin/windres
+i386-mingw32/include/GL/gl.h
+i386-mingw32/include/GL/glext.h
+i386-mingw32/include/GL/glu.h
i386-mingw32/include/_mingw.h
i386-mingw32/include/accctrl.h
i386-mingw32/include/aclapi.h
+i386-mingw32/include/afxres.h
i386-mingw32/include/assert.h
i386-mingw32/include/basetsd.h
i386-mingw32/include/basetyps.h
+i386-mingw32/include/c++/${GCC_VERSION}/algorithm
+i386-mingw32/include/c++/${GCC_VERSION}/backward/algo.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/algobase.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/alloc.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/backward_warning.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/bvector.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/complex.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/defalloc.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/deque.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/fstream.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/function.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/hash_map.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/hash_set.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/hashtable.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/heap.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/iomanip.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/iostream.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/istream.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/iterator.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/list.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/map.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/multimap.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/multiset.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/new.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/ostream.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/pair.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/queue.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/rope.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/set.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/slist.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/stack.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/stream.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/streambuf.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/strstream
+i386-mingw32/include/c++/${GCC_VERSION}/backward/tempbuf.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/tree.h
+i386-mingw32/include/c++/${GCC_VERSION}/backward/vector.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/basic_ios.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/basic_ios.tcc
+i386-mingw32/include/c++/${GCC_VERSION}/bits/basic_string.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/basic_string.tcc
+i386-mingw32/include/c++/${GCC_VERSION}/bits/boost_concept_check.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/char_traits.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/cmath.tcc
+i386-mingw32/include/c++/${GCC_VERSION}/bits/codecvt.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/concept_check.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/cpp_type_traits.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/deque.tcc
+i386-mingw32/include/c++/${GCC_VERSION}/bits/fpos.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/fstream.tcc
+i386-mingw32/include/c++/${GCC_VERSION}/bits/functexcept.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/gslice.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/gslice_array.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/indirect_array.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/ios_base.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/istream.tcc
+i386-mingw32/include/c++/${GCC_VERSION}/bits/list.tcc
+i386-mingw32/include/c++/${GCC_VERSION}/bits/locale_classes.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/locale_facets.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/locale_facets.tcc
+i386-mingw32/include/c++/${GCC_VERSION}/bits/localefwd.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/mask_array.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/ostream.tcc
+i386-mingw32/include/c++/${GCC_VERSION}/bits/pthread_allocimpl.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/slice_array.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/sstream.tcc
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_algo.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_algobase.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_alloc.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_bvector.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_construct.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_deque.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_function.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_heap.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_iterator.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_iterator_base_funcs.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_iterator_base_types.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_list.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_map.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_multimap.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_multiset.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_numeric.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_pair.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_pthread_alloc.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_queue.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_raw_storage_iter.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_relops.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_set.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_stack.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_tempbuf.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_threads.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_tree.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_uninitialized.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stl_vector.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stream_iterator.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/streambuf.tcc
+i386-mingw32/include/c++/${GCC_VERSION}/bits/streambuf_iterator.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/stringfwd.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/type_traits.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/valarray_array.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/valarray_array.tcc
+i386-mingw32/include/c++/${GCC_VERSION}/bits/valarray_meta.h
+i386-mingw32/include/c++/${GCC_VERSION}/bits/vector.tcc
+i386-mingw32/include/c++/${GCC_VERSION}/bitset
+i386-mingw32/include/c++/${GCC_VERSION}/cassert
+i386-mingw32/include/c++/${GCC_VERSION}/cctype
+i386-mingw32/include/c++/${GCC_VERSION}/cerrno
+i386-mingw32/include/c++/${GCC_VERSION}/cfloat
+i386-mingw32/include/c++/${GCC_VERSION}/ciso646
+i386-mingw32/include/c++/${GCC_VERSION}/climits
Home |
Main Index |
Thread Index |
Old Index