From 7528b4d4373ccd9003f863dd5974aca646f8cb55 Mon Sep 17 00:00:00 2001 From: grant Date: Sun, 13 Jul 2003 13:04:09 +0000 Subject: greatly simplify the handling of pkgsrc gcc, and eliminate a bug which has allowed these packages to work :) set CC, CXX, CPP and F77 in gcc{,3}/buildlink2.mk. you now only need to define USE_GCC2 or USE_GCC3 to use the pkgsrc gcc of your choice. the share/examples/gcc/mk.conf and gcc3/mk.conf files are no longer installed. bump PKGREVISIONs. --- lang/gcc/Makefile | 4 ++-- lang/gcc/PLIST | 5 ++--- lang/gcc/buildlink2.mk | 44 +++++++------------------------------------- lang/gcc/files/gcc.mk | 7 ------- lang/gcc3/Makefile | 8 ++------ lang/gcc3/PLIST | 5 ++--- lang/gcc3/buildlink2.mk | 35 +++++++---------------------------- lang/gcc3/files/gcc3.mk | 10 ---------- 8 files changed, 22 insertions(+), 96 deletions(-) delete mode 100644 lang/gcc/files/gcc.mk delete mode 100644 lang/gcc3/files/gcc3.mk (limited to 'lang') diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile index c3d3e71b3c6..5cbc67c0fa0 100644 --- a/lang/gcc/Makefile +++ b/lang/gcc/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.66 2003/07/12 08:53:40 jtb Exp $ +# $NetBSD: Makefile,v 1.67 2003/07/13 13:04:09 grant Exp $ DISTNAME= gcc-2.95.3 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GNU:=gcc/} diff --git a/lang/gcc/PLIST b/lang/gcc/PLIST index d7ce7b87998..c6963082677 100644 --- a/lang/gcc/PLIST +++ b/lang/gcc/PLIST @@ -1,3 +1,2 @@ -@comment $NetBSD: PLIST,v 1.10 2003/07/04 16:27:24 seb Exp $ -share/examples/${DISTNAME}/mk.conf -@dirrm share/examples/${DISTNAME} +@comment $NetBSD: PLIST,v 1.11 2003/07/13 13:04:09 grant Exp $ +@this plist intentionally left blank diff --git a/lang/gcc/buildlink2.mk b/lang/gcc/buildlink2.mk index b88acf29d88..cedbe114993 100644 --- a/lang/gcc/buildlink2.mk +++ b/lang/gcc/buildlink2.mk @@ -1,10 +1,12 @@ -# $NetBSD: buildlink2.mk,v 1.12 2003/06/05 02:20:03 grant Exp $ +# $NetBSD: buildlink2.mk,v 1.13 2003/07/13 13:04:09 grant Exp $ + +# do not directly include this file. .include "../../mk/gcc.buildlink2.mk" +# to ensure the correct gcc package is selected based on USE_GCC2 and +# USE_GCC3. .if !defined(GCC2_BUILDLINK2_MK) GCC2_BUILDLINK2_MK= # defined -.include "../../mk/bsd.prefs.mk" - # If you want to allow EGCS to satisfy the GCC requirement, then set # GCC_REQD to "2.8.0". # @@ -30,37 +32,6 @@ _GCC_ARCHDIR= ${_GCC_PREFIX}${_GCC_ARCHSUBDIR} BUILDLINK_LDFLAGS.gcc= -L${_GCC_ARCHDIR} -Wl,${RPATH_FLAG}${_GCC_ARCHDIR} -L${_GCC_PREFIX}lib -Wl,${RPATH_FLAG}${_GCC_PREFIX}lib -_GCC_VERSION!= ( gcc -dumpversion ) 2>/dev/null || ${ECHO} 0 -# -# GCC_VERSION is the version number of the gcc detected above. EGCS gcc is -# considered to be "gcc-2.8.1" so that it will match "gcc>=2.8.0". -# -# GCC_PKG is the package name "gcc-${GCC_VERSION} for the gcc detected above. -# -.if !empty(_GCC_VERSION:Megcs-[0-9]*) -GCC_VERSION= 2.8.1 -.else -GCC_VERSION= ${_GCC_VERSION} -.endif -GCC_PKG= gcc-${GCC_VERSION} - -.if defined(USE_PKGSRC_GCC) -_NEED_PKGSRC_GCC= YES -.else -_NEED_PKGSRC_GCC!= \ - if ${PKG_ADMIN} pmatch '${BUILDLINK_DEPENDS.gcc}' ${GCC_PKG}; then \ - gccpath=`${TYPE} gcc | ${AWK} '{ print $$NF }'`; \ - if [ "$$gccpath" = "${_GCC_PREFIX}bin/gcc" ]; then \ - ${ECHO} "YES"; \ - else \ - ${ECHO} "NO"; \ - fi; \ - else \ - ${ECHO} "YES"; \ - fi -.endif - -.if ${_NEED_PKGSRC_GCC} == "YES" BUILDLINK_PACKAGES+= gcc PATH:= ${_GCC_PREFIX}bin:${PATH} CC= ${_GCC_PREFIX}bin/gcc @@ -69,12 +40,11 @@ CXX= ${_GCC_PREFIX}bin/g++ F77= ${_GCC_PREFIX}bin/g77 PKG_FC= ${F77} -. if defined(USE_GCC_SHLIB) +.if defined(USE_GCC_SHLIB) LDFLAGS+= ${BUILDLINK_LDFLAGS.gcc} -. endif +.endif BUILDLINK_WRAPPER_ENV+= \ COMPILER_PATH="${BUILDLINK_DIR}/bin"; export COMPILER_PATH -.endif # _NEED_PKGSRC_GCC == YES # These files are from gcc>=2.95.3. BUILDLINK_FILES.gcc= ${_GCC_SUBPREFIX}include/g++-3/* diff --git a/lang/gcc/files/gcc.mk b/lang/gcc/files/gcc.mk deleted file mode 100644 index 7a9a58fc384..00000000000 --- a/lang/gcc/files/gcc.mk +++ /dev/null @@ -1,7 +0,0 @@ -# $NetBSD: gcc.mk,v 1.5 2003/07/04 16:11:56 seb Exp $ -# -# make configuration file for @DISTNAME@ - -CC= @GCC_PREFIX@/bin/cc -CPP= @GCC_PREFIX@/bin/cpp -CXX= @GCC_PREFIX@/bin/c++ diff --git a/lang/gcc3/Makefile b/lang/gcc3/Makefile index f671d728814..accf1e1b0cb 100644 --- a/lang/gcc3/Makefile +++ b/lang/gcc3/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.36 2003/07/08 16:30:44 abs Exp $ +# $NetBSD: Makefile,v 1.37 2003/07/13 13:04:09 grant Exp $ # DISTNAME= gcc-3.3 -PKGREVISION= 4 +PKGREVISION= 5 PKGNAME= ${DISTNAME:C|gcc|gcc3|} CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-3.3/} @@ -92,15 +92,11 @@ pre-configure: ${MKDIR} ${BUILD_DIRS} cd ${WRKSRC} && contrib/gcc_update --touch -post-build: - @${SED} ${FILES_SUBST_SED} ${FILESDIR}/gcc3.mk > ${WRKDIR}/gcc3.mk - post-install: .if ${OPSYS} == "SunOS" -cd ${GCC_ARCHDIR}/include && ${RM} -f fixed && ${RMDIR} v7 v9 .endif ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/${DISTNAME} - ${INSTALL_DATA} ${WRKDIR}/gcc3.mk ${PREFIX}/share/examples/${DISTNAME}/mk.conf ${LN} -f ${GCC_PREFIX}/bin/gcc ${GCC_PREFIX}/bin/cc # ${LN} -f ${GCC_PREFIX}/bin/g77 ${GCC_PREFIX}/bin/f77 ${CP} -f ${PKGDIR}/PLIST ${PLIST_SRC} diff --git a/lang/gcc3/PLIST b/lang/gcc3/PLIST index fed56294a6e..1206c0ddced 100644 --- a/lang/gcc3/PLIST +++ b/lang/gcc3/PLIST @@ -1,3 +1,2 @@ -@comment $NetBSD: PLIST,v 1.8 2003/07/04 16:27:27 seb Exp $ -share/examples/${DISTNAME}/mk.conf -@dirrm share/examples/${DISTNAME} +@comment $NetBSD: PLIST,v 1.9 2003/07/13 13:04:10 grant Exp $ +@this plist intentionally left blank diff --git a/lang/gcc3/buildlink2.mk b/lang/gcc3/buildlink2.mk index a8982fe7f27..aeebfc89c37 100644 --- a/lang/gcc3/buildlink2.mk +++ b/lang/gcc3/buildlink2.mk @@ -1,10 +1,12 @@ -# $NetBSD: buildlink2.mk,v 1.5 2003/07/02 19:02:55 drochner Exp $ +# $NetBSD: buildlink2.mk,v 1.6 2003/07/13 13:04:10 grant Exp $ + +# do not directly include this file. .include "../../mk/gcc.buildlink2.mk" +# to ensure the correct gcc package is selected based on USE_GCC2 and +# USE_GCC3. .if !defined(GCC3_BUILDLINK2_MK) GCC3_BUILDLINK2_MK= # defined -.include "../../mk/bsd.prefs.mk" - GCC_REQD?= 3.3 BUILDLINK_DEPENDS.gcc?= gcc3>=${GCC_REQD} BUILDLINK_PKGSRCDIR.gcc?= ../../lang/gcc3 @@ -30,28 +32,6 @@ _GCC_ARCHDIR= ${_GCC_PREFIX}${_GCC_ARCHSUBDIR} BUILDLINK_LDFLAGS.gcc= -L${_GCC_ARCHDIR} -Wl,${RPATH_FLAG}${_GCC_ARCHDIR} -L${_GCC_PREFIX}lib -Wl,${RPATH_FLAG}${_GCC_PREFIX}lib -_GCC_VERSION!= ( ${CC} -dumpversion ) 2>/dev/null || ${ECHO} 0 - -GCC_VERSION= ${_GCC_VERSION} -GCC_PKG= gcc-${GCC_VERSION} - -.if defined(USE_PKGSRC_GCC) -_NEED_PKGSRC_GCC= YES -.else -_NEED_PKGSRC_GCC!= \ - if ${PKG_ADMIN} pmatch '${BUILDLINK_DEPENDS.gcc}' ${GCC_PKG}; then \ - gccpath=`${TYPE} gcc | ${AWK} '{ print $$NF }'`; \ - if [ "$$gccpath" = "${_GCC_PREFIX}bin/gcc" ]; then \ - ${ECHO} "YES"; \ - else \ - ${ECHO} "NO"; \ - fi; \ - else \ - ${ECHO} "YES"; \ - fi -.endif - -.if ${_NEED_PKGSRC_GCC} == "YES" BUILDLINK_PACKAGES+= gcc PATH:= ${_GCC_PREFIX}bin:${PATH} CC= ${_GCC_PREFIX}bin/gcc @@ -60,12 +40,11 @@ CXX= ${_GCC_PREFIX}bin/g++ F77= ${_GCC_PREFIX}bin/g77 PKG_FC= ${F77} -. if defined(USE_GCC_SHLIB) +.if defined(USE_GCC_SHLIB) LDFLAGS+= ${BUILDLINK_LDFLAGS.gcc} -. endif +.endif BUILDLINK_WRAPPER_ENV+= \ COMPILER_PATH="${BUILDLINK_DIR}/bin"; export COMPILER_PATH -.endif # _NEED_PKGSRC_GCC == YES # These files are from gcc-3.3. BUILDLINK_FILES.gcc= ${_GCC_SUBPREFIX}include/c++/3.3/* diff --git a/lang/gcc3/files/gcc3.mk b/lang/gcc3/files/gcc3.mk deleted file mode 100644 index d55ae8b3ede..00000000000 --- a/lang/gcc3/files/gcc3.mk +++ /dev/null @@ -1,10 +0,0 @@ -# $NetBSD: gcc3.mk,v 1.7 2003/07/04 16:11:58 seb Exp $ -# -# make configuration file for @DISTNAME@ - -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 -- cgit v1.2.3