From 7497ad9c29a7801053f90a11bfbc1d26894b0699 Mon Sep 17 00:00:00 2001 From: drochner Date: Tue, 8 Jul 2003 15:04:53 +0000 Subject: some cleanup: -USE_NEW_TEXINFO, saves some patches -symlink libiberty.a into build tree instead of buildlink/lib, saves some patches -put common make rules into Makefile.common (for all) and buildaddon.mk (for all but the base "c" pkg) --- lang/gcc3-c/MESSAGE | 4 +- lang/gcc3-c/Makefile | 92 +++++--------------------------------------- lang/gcc3-c/Makefile.common | 87 +++++++++++++++++++++++++++++++++++++++++ lang/gcc3-c/PLIST | 16 +------- lang/gcc3-c/buildaddon.mk | 27 +++++++++++++ lang/gcc3-c/buildlink2.mk | 35 ----------------- lang/gcc3-c/distinfo | 5 +-- lang/gcc3-c/files/gcc3.mk | 7 +--- lang/gcc3-c/patches/patch-aa | 21 ---------- lang/gcc3-c/patches/patch-ab | 16 +------- 10 files changed, 131 insertions(+), 179 deletions(-) create mode 100644 lang/gcc3-c/Makefile.common create mode 100644 lang/gcc3-c/buildaddon.mk delete mode 100644 lang/gcc3-c/buildlink2.mk delete mode 100644 lang/gcc3-c/patches/patch-aa (limited to 'lang/gcc3-c') diff --git a/lang/gcc3-c/MESSAGE b/lang/gcc3-c/MESSAGE index 32ccdacd8e6..7fd8a8885be 100644 --- a/lang/gcc3-c/MESSAGE +++ b/lang/gcc3-c/MESSAGE @@ -1,7 +1,7 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.1 2003/07/06 12:15:06 drochner Exp $ +$NetBSD: MESSAGE,v 1.2 2003/07/08 15:04:56 drochner Exp $ -To use ${PKGNAME} include "${PREFIX}/share/examples/gcc/mk.conf" in your +To use ${PKGNAME} include "${GCC_PREFIX}/mk/c.mk" in your BSD style makefile. =========================================================================== diff --git a/lang/gcc3-c/Makefile b/lang/gcc3-c/Makefile index 00a5130e01a..49159030948 100644 --- a/lang/gcc3-c/Makefile +++ b/lang/gcc3-c/Makefile @@ -1,86 +1,17 @@ -# $NetBSD: Makefile,v 1.2 2003/07/06 12:31:58 grant Exp $ +# $NetBSD: Makefile,v 1.3 2003/07/08 15:04:56 drochner Exp $ # -DISTNAME= gcc-3.3 -PKGNAME= gcc3-c-3.3 -CATEGORIES= lang -MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-3.3/} -EXTRACT_SUFX= .tar.bz2 +PKGNAME= gcc3-c-${GCC_VERSION} +COMMENT= GNU Compiler Collection, C compiler -MAINTAINER= tech-pkg@netbsd.org -HOMEPAGE= http://www.gnu.org/software/gcc/gcc.html -COMMENT= GNU Compiler Collection +INFO_FILES= cpp.info gcc.info gccint.info cppinternals.info -# XXX just because of .info files -#CONFLICTS+= gcc-3* pgcc-[0-9]* gcc3-[0-9]* +.include "Makefile.common" -NOT_FOR_PLATFORM= Darwin-*-* - -USE_BUILDLINK2= YES -USE_PKGINSTALL= YES -USE_GMAKE= YES - -HAS_CONFIGURE= YES - -CONFIGURE_ARGS+= --infodir=${PREFIX}/info -CONFIGURE_ARGS+= --prefix=${GCC_PREFIX} - -# as this is named gcc3, use DISTNAME instead. -FILES_SUBST+= PKGNAME_NOREV=${DISTNAME} GCC_PREFIX=${GCC_PREFIX} -MESSAGE_SUBST+= PKGNAME_NOREV=${DISTNAME} - -TEXINFO_REQD= 4.2 -INFO_FILES= cpp.info gcc.info - -.include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "NetBSD" && exists(/usr/include/pthread.h) -CONFIGURE_ARGS+= --host=${MACHINE_GNU_ARCH}--netbsdelf2.0 -PTHREAD_OPTS+= require native -.include "../../mk/pthread.buildlink2.mk" -CPPFLAGS+= -I${BUILDLINK_DIR}/include -CFLAGS+= -I${BUILDLINK_DIR}/include -.else -CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM} -.endif -CONFIGURE_ARGS+= --enable-languages="c" - -.if ${OPSYS} == "NetBSD" && !defined(USE_BINUTILS) -AS_VERSION!= ${AS} --version | ${AWK} '{ \ - split($$3, v, /[.]/); \ - printf "%02d%02d%02d%02d\n",v[1],v[2],v[3],v[4]; \ - exit; \ - }' -USE_BINUTILS!= ${TEST} ${AS_VERSION} -lt 02130201 && echo YES || echo NO -.endif - -.if defined(USE_BINUTILS) && ${USE_BINUTILS} == "YES" -DEPENDS= binutils>=2.13.2.1:../../devel/binutils -CONFIGURE_ARGS+= --with-as=${PREFIX}/${MACHINE_GNU_PLATFORM}/bin/as -#. include "../../devel/binutils/buildlink2.mk" -.endif - -.if ${OPSYS} == "NetBSD" || ${OPSYS} == "Linux" -CONFIGURE_ARGS+= --enable-shared -.else -. if ${OPSYS} == "SunOS" -CONFIGURE_ARGS+= --enable-shared -. else -CONFIGURE_ARGS+= --disable-shared -. endif -. if ${CC:M*gcc*} == "" -ALL_TARGET= bootstrap -. endif -.endif - -GCC_PREFIX= ${PREFIX}/gcc3 -GCC_VERSION= ${PKGVERSION:C|nb*||} -GCC_ARCHDIR= ${GCC_PREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION} +# the "gcc" frontend knows all languages (by patch) +CONFIGURE_ARGS+= --enable-languages=c PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC -pre-configure: - ${MKDIR} ${BUILD_DIRS} - cd ${WRKSRC} && contrib/gcc_update --touch - post-build: @${SED} ${FILES_SUBST_SED} ${FILESDIR}/gcc3.mk > ${WRKDIR}/gcc3.mk @@ -88,8 +19,8 @@ post-install: .if ${OPSYS} == "SunOS" -cd ${GCC_ARCHDIR}/include && ${RM} -f fixed && ${RMDIR} v7 v9 .endif - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gcc - ${INSTALL_DATA} ${WRKDIR}/gcc3.mk ${PREFIX}/share/examples/gcc/mk.conf + ${INSTALL_DATA_DIR} ${GCC_PREFIX}/mk + ${INSTALL_DATA} ${WRKDIR}/gcc3.mk ${GCC_PREFIX}/mk/c.mk ${LN} -f ${GCC_PREFIX}/bin/gcc ${GCC_PREFIX}/bin/cc ${CP} -f ${PKGDIR}/PLIST ${PLIST_SRC} ${FIND} ${GCC_PREFIX} \( -type f -o -type l \) -print \ @@ -99,9 +30,4 @@ post-install: | ${SORT} -r | ${SED} -e "s,${PREFIX}/,@dirrm ,g" \ >> ${PLIST_SRC} -.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" - -# Make bootstrap with compiler != gcc possible. -CONFIGURE_ENV+= LDFLAGS="${_STRIPFLAG_CC}" -MAKE_ENV+= GCC_PREFIX="${GCC_PREFIX}" diff --git a/lang/gcc3-c/Makefile.common b/lang/gcc3-c/Makefile.common new file mode 100644 index 00000000000..9a73454627b --- /dev/null +++ b/lang/gcc3-c/Makefile.common @@ -0,0 +1,87 @@ +# $NetBSD: Makefile.common,v 1.1 2003/07/08 15:04:56 drochner Exp $ +# + +GCC_VERSION= 3.3 +DISTNAME= gcc-${GCC_VERSION} +CATEGORIES= lang +MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/} +EXTRACT_SUFX= .tar.bz2 + +MAINTAINER= tech-pkg@netbsd.org +HOMEPAGE= http://www.gnu.org/software/gcc/gcc.html + +NOT_FOR_PLATFORM= Darwin-*-* + +USE_BUILDLINK2= YES +USE_PKGINSTALL= YES +USE_GMAKE= YES +HAS_CONFIGURE= YES + +.include "../../mk/bsd.prefs.mk" + +# Make location overridable, to allow ping-pong bootstraps. +GCC3_DEFAULT_SUBPREFIX= gcc3 +GCC3_INSTALLTO_SUBPREFIX?= ${GCC3_DEFAULT_SUBPREFIX} + +GCC_SUBPREFIX= ${GCC3_INSTALLTO_SUBPREFIX} +GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX} +CONFIGURE_ARGS+= --prefix=${GCC_PREFIX} +PLIST_SUBST+= GCC_SUBPREFIX=${GCC_SUBPREFIX} +FILES_SUBST+= GCC_PREFIX=${GCC_PREFIX} +FILES_SUBST+= PKGNAME=${PKGNAME} +MESSAGE_SUBST+= GCC_PREFIX=${GCC_PREFIX} + +.if defined(INFO_FILES) +USE_NEW_TEXINFO= yes +INFO_DIR= ${GCC_SUBPREFIX}/info +.include "../../mk/texinfo.mk" +.endif + +# Support threads and building of crt*.o on post-1.6 -current. +# Use buildlink to avoid a GNU pth package. +.if ${OPSYS} == "NetBSD" && exists(/usr/include/pthread.h) +GCC_PLATFORM= ${MACHINE_GNU_ARCH}--netbsdelf2.0 +PTHREAD_OPTS+= require native +.include "../../mk/pthread.buildlink2.mk" +CPPFLAGS+= -I${BUILDLINK_DIR}/include +CFLAGS+= -I${BUILDLINK_DIR}/include +.else +GCC_PLATFORM= ${MACHINE_GNU_PLATFORM} +.endif +CONFIGURE_ARGS+= --host=${GCC_PLATFORM} +PLIST_SUBST+= GCC_PLATFORM=${GCC_PLATFORM} + +.if ${OPSYS} == "NetBSD" && !defined(USE_BINUTILS) +AS_VERSION!= ${AS} --version | ${AWK} '{ \ + split($$3, v, /[.]/); \ + printf "%02d%02d%02d%02d\n",v[1],v[2],v[3],v[4]; \ + exit; \ + }' +USE_BINUTILS!= ${TEST} ${AS_VERSION} -lt 02130201 && echo YES || echo NO +.endif + +.if defined(USE_BINUTILS) && ${USE_BINUTILS} == "YES" +DEPENDS= binutils>=2.13.2.1:../../devel/binutils +CONFIGURE_ARGS+= --with-as=${PREFIX}/${MACHINE_GNU_PLATFORM}/bin/as +#. include "../../devel/binutils/buildlink2.mk" +.endif + +.if ${OPSYS} == "NetBSD" || ${OPSYS} == "Linux" +CONFIGURE_ARGS+= --enable-shared +.else +. if ${OPSYS} == "SunOS" +CONFIGURE_ARGS+= --enable-shared +. else +CONFIGURE_ARGS+= --disable-shared +. endif +. if ${CC:M*gcc*} == "" +ALL_TARGET= bootstrap +. endif +.endif + +GCC_ARCHSUBDIR= ${GCC_SUBPREFIX}/lib/gcc-lib/${GCC_PLATFORM}/${GCC_VERSION} +GCC_ARCHDIR= ${PREFIX}/${GCC_ARCHSUBDIR} + +pre-configure: + ${MKDIR} ${BUILD_DIRS} + cd ${WRKSRC} && contrib/gcc_update --touch diff --git a/lang/gcc3-c/PLIST b/lang/gcc3-c/PLIST index 7c629b56cc5..3cf473f2799 100644 --- a/lang/gcc3-c/PLIST +++ b/lang/gcc3-c/PLIST @@ -1,15 +1 @@ -@comment $NetBSD: PLIST,v 1.1 2003/07/06 12:15:07 drochner Exp $ -@unexec ${INSTALL_INFO} --delete %D/info/cpp.info %D/info/dir -info/cpp.info -@exec ${INSTALL_INFO} %D/info/cpp.info %D/info/dir -@unexec ${INSTALL_INFO} --delete %D/info/gcc.info %D/info/dir -info/gcc.info -@exec ${INSTALL_INFO} %D/info/gcc.info %D/info/dir -@unexec ${INSTALL_INFO} --delete %D/info/gccint.info %D/info/dir -info/gccint.info -@exec ${INSTALL_INFO} %D/info/gccint.info %D/info/dir -@unexec ${INSTALL_INFO} --delete %D/info/cppinternals.info %D/info/dir -info/cppinternals.info -@exec ${INSTALL_INFO} %D/info/cppinternals.info %D/info/dir -share/examples/gcc/mk.conf -@dirrm share/examples/gcc +@comment $NetBSD: PLIST,v 1.2 2003/07/08 15:04:56 drochner Exp $ diff --git a/lang/gcc3-c/buildaddon.mk b/lang/gcc3-c/buildaddon.mk new file mode 100644 index 00000000000..14281c61451 --- /dev/null +++ b/lang/gcc3-c/buildaddon.mk @@ -0,0 +1,27 @@ +# $NetBSD: buildaddon.mk,v 1.1 2003/07/08 15:04:56 drochner Exp $ + +.include "../../lang/gcc3-c/Makefile.common" + +pre-build: + (cd ${WRKSRC}/gcc && ${SETENV} ${MAKE_ENV} ${GMAKE} tconfig.h) + ${LN} -sf ${GCC_PREFIX}/lib/libiberty.a ${WRKSRC}/libiberty + ${LN} -sf ${GCC_PREFIX}/bin/gcc ${WRKSRC}/gcc/xgcc + +BUILDLINK_DEPENDS.gcc3c?= gcc3-c-3.3 +BUILDLINK_PKGSRCDIR.gcc3c?= ../../lang/gcc3-c + +BUILDLINK_PREFIX.gcc3c= ${LOCALBASE} + +BUILDLINK_PACKAGES+= gcc3c + +BUILDLINK_FILES.gcc3c+= ${GCC_ARCHSUBDIR}/include/* +BUILDLINK_FILES.gcc3c+= ${GCC_ARCHSUBDIR}/include/*/* +BUILDLINK_FILES.gcc3c+= ${GCC_ARCHSUBDIR}/include/*/*/* +BUILDLINK_FILES.gcc3c+= ${GCC_ARCHSUBDIR}/include/*/*/*/* +BUILDLINK_FILES.gcc3c+= ${GCC_ARCHSUBDIR}/libgcc.a +BUILDLINK_FILES.gcc3c+= ${GCC_ARCHSUBDIR}/libgcc_eh.a +BUILDLINK_FILES.gcc3c+= ${GCC_SUBPREFIX}/lib/libgcc_s.* + +BUILDLINK_TARGETS+= gcc3c-buildlink + +gcc3c-buildlink: _BUILDLINK_USE diff --git a/lang/gcc3-c/buildlink2.mk b/lang/gcc3-c/buildlink2.mk deleted file mode 100644 index fd5414e6433..00000000000 --- a/lang/gcc3-c/buildlink2.mk +++ /dev/null @@ -1,35 +0,0 @@ -# $NetBSD: buildlink2.mk,v 1.1 2003/07/06 12:15:07 drochner Exp $ - -.if !defined(GCC3_C_BUILDLINK2_MK) -GCC3_C_BUILDLINK2_MK= # defined - -BUILDLINK_DEPENDS.gcc3c?= gcc3-c-3.3 -BUILDLINK_PKGSRCDIR.gcc3c?= ../../lang/gcc3-c - -BUILDLINK_PREFIX.gcc3c= ${LOCALBASE} - -_GCC_SUBPREFIX= gcc3/ -_GCC_PREFIX= ${BUILDLINK_PREFIX.gcc3c}/${_GCC_SUBPREFIX} -_GCC_LIBGCCDIR!= \ - dirname `${_GCC_PREFIX}bin/gcc --print-libgcc-file-name` -_GCC_ARCHSUBDIR= \ - ${_GCC_LIBGCCDIR:S|^${BUILDLINK_PREFIX.gcc3c}/${_GCC_SUBPREFIX}||} -_GCC_ARCHDIR= ${_GCC_PREFIX}${_GCC_ARCHSUBDIR} - -BUILDLINK_PACKAGES+= gcc3c - -# These files are from gcc-3.3. -BUILDLINK_FILES.gcc3c+= ${_GCC_SUBPREFIX}${_GCC_ARCHSUBDIR}/include/* -BUILDLINK_FILES.gcc3c+= ${_GCC_SUBPREFIX}${_GCC_ARCHSUBDIR}/include/*/* -BUILDLINK_FILES.gcc3c+= ${_GCC_SUBPREFIX}${_GCC_ARCHSUBDIR}/include/*/*/* -BUILDLINK_FILES.gcc3c+= ${_GCC_SUBPREFIX}${_GCC_ARCHSUBDIR}/include/*/*/*/* -BUILDLINK_FILES.gcc3c+= ${_GCC_SUBPREFIX}${_GCC_ARCHSUBDIR}/lib*.* -BUILDLINK_FILES.gcc3c+= ${_GCC_SUBPREFIX}${_GCC_ARCHSUBDIR}/specs -BUILDLINK_FILES.gcc3c+= ${_GCC_SUBPREFIX}lib/libgcc_s.* -BUILDLINK_FILES.gcc3c+= ${_GCC_SUBPREFIX}lib/libiberty.* - -BUILDLINK_TARGETS+= gcc3c-buildlink - -gcc3c-buildlink: _BUILDLINK_USE - -.endif # GCC3_C_BUILDLINK2_MK diff --git a/lang/gcc3-c/distinfo b/lang/gcc3-c/distinfo index 4ede7a5953f..8dfbb66749b 100644 --- a/lang/gcc3-c/distinfo +++ b/lang/gcc3-c/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.1 2003/07/06 12:15:07 drochner Exp $ +$NetBSD: distinfo,v 1.2 2003/07/08 15:04:57 drochner Exp $ SHA1 (gcc-3.3.tar.bz2) = 18e23822c6dc9cb462e0ff88bc1b8a20c53da60a Size (gcc-3.3.tar.bz2) = 23447616 bytes -SHA1 (patch-aa) = 029b1f58f75f3a28b69894dfc87e5fa5eab257d9 -SHA1 (patch-ab) = 3cb04098b3d97b1da9d24d64197dcea2771c9624 +SHA1 (patch-ab) = 8e899db69149894e737e1f68372f3eef9c403635 SHA1 (patch-ae) = e5dd184ca1b0c415215e82d0250469792a432741 SHA1 (patch-ai) = bb9f4975769cd104b25b4609a1d4c888bb147bb1 diff --git a/lang/gcc3-c/files/gcc3.mk b/lang/gcc3-c/files/gcc3.mk index 916cb6fe2ee..1fb17b19215 100644 --- a/lang/gcc3-c/files/gcc3.mk +++ b/lang/gcc3-c/files/gcc3.mk @@ -1,10 +1,7 @@ -# $NetBSD: gcc3.mk,v 1.1 2003/07/06 12:15:08 drochner Exp $ +# $NetBSD: gcc3.mk,v 1.2 2003/07/08 15:04:57 drochner Exp $ # -# make configuration file for @PKGNAME_NOREV@ +# make configuration file for @PKGNAME@ USE_GCC3= # defined CC= @GCC_PREFIX@/bin/cc CPP= @GCC_PREFIX@/bin/cpp -CXX= @GCC_PREFIX@/bin/c++ -F77= @GCC_PREFIX@/bin/g77 -PKG_FC= @GCC_PREFIX@/bin/g77 diff --git a/lang/gcc3-c/patches/patch-aa b/lang/gcc3-c/patches/patch-aa deleted file mode 100644 index 5ef78495cdf..00000000000 --- a/lang/gcc3-c/patches/patch-aa +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2003/07/06 12:15:08 drochner Exp $ - ---- Makefile.in.orig Wed May 14 10:18:14 2003 -+++ Makefile.in -@@ -153,11 +153,11 @@ M4 = `if [ -f $$r/m4/m4 ] ; \ - - # For an installed makeinfo, we require it to be from texinfo 4.2 or - # higher, else we use the "missing" dummy. --MAKEINFO = `if [ -f $$r/texinfo/makeinfo/makeinfo ] ; \ -- then echo $$r/texinfo/makeinfo/makeinfo ; \ -- else if (makeinfo --version \ -- | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])') >/dev/null 2>&1; \ -- then echo makeinfo; else echo $$s/missing makeinfo; fi; fi` -+#MAKEINFO = `if [ -f $$r/texinfo/makeinfo/makeinfo ] ; \ -+# then echo $$r/texinfo/makeinfo/makeinfo ; \ -+# else if (makeinfo --version \ -+# | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])') >/dev/null 2>&1; \ -+# then echo makeinfo; else echo $$s/missing makeinfo; fi; fi` - - # This just becomes part of the MAKEINFO definition passed down to - # sub-makes. It lets flags be given on the command line while still diff --git a/lang/gcc3-c/patches/patch-ab b/lang/gcc3-c/patches/patch-ab index b56380c117f..02d2a06ceaf 100644 --- a/lang/gcc3-c/patches/patch-ab +++ b/lang/gcc3-c/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1 2003/07/06 12:15:08 drochner Exp $ +$NetBSD: patch-ab,v 1.2 2003/07/08 15:04:58 drochner Exp $ --- gcc/Makefile.in.orig Tue Jan 28 16:54:07 2003 +++ gcc/Makefile.in Sat May 24 13:01:38 2003 @@ -10,17 +10,3 @@ $NetBSD: patch-ab,v 1.1 2003/07/06 12:15:08 drochner Exp $ -DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \ -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc-lib/\" \ -DDEFAULT_TARGET_VERSION=\"$(version)\" \ -@@ -2662,11 +2663,11 @@ - $(INSTALL_DATA) $$f $(DESTDIR)$(infodir)/$$realfile; \ - done; \ - else true; fi -- -if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ -+ -if $(SHELL) -c '${INSTALL_INFO} --version' >/dev/null 2>&1; then \ - if [ -f $(DESTDIR)$(infodir)/dir ] ; then \ - for f in cpp.info gcc.info gccint.info cppinternals.info; do \ - if [ -f $(DESTDIR)$(infodir)/$$f ]; then \ -- install-info --dir-file=$(DESTDIR)$(infodir)/dir $(DESTDIR)$(infodir)/$$f; \ -+ ${INSTALL_INFO} --dir-file=$(DESTDIR)$(infodir)/dir $(DESTDIR)$(infodir)/$$f; \ - else true; fi; \ - done; \ - else true; fi; \ -- cgit v1.2.3