pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang bl3ify the gcc3-* packages. Also provide buildli...
details: https://anonhg.NetBSD.org/pkgsrc/rev/f9afcdf474b9
branches: trunk
changeset: 467486:f9afcdf474b9
user: jlam <jlam%pkgsrc.org@localhost>
date: Sun Feb 01 14:05:46 2004 +0000
description:
bl3ify the gcc3-* packages. Also provide buildlink[23].mk files for use
by bsd.compiler.mk. Note that in the buildlink3.mk files, the dependency
is always added regardless of the BUILDLINK_DEPTH. This is because these
buildlink3.mk files may be included by bsd.prefs.mk, which is often
included other buildlink3.mk files, and we need to ensure that regardless
of the depth, we are using the correct compiler.
diffstat:
lang/gcc3-ada/DESCR | 15 +--------
lang/gcc3-ada/Makefile | 70 ++++++++++++++++++++++----------------------
lang/gcc3-c++/DESCR | 15 +--------
lang/gcc3-c++/Makefile | 23 ++++++-------
lang/gcc3-c++/buildlink2.mk | 45 ++++++++++++++++++++++++++++
lang/gcc3-c++/buildlink3.mk | 25 +++++++++++++++
lang/gcc3-c/DESCR | 15 +--------
lang/gcc3-c/Makefile | 15 +++++---
lang/gcc3-c/Makefile.common | 39 ++++++++---------------
lang/gcc3-c/buildaddon.mk | 23 --------------
lang/gcc3-c/buildlink2.mk | 40 +++++++++++++++++++++++++
lang/gcc3-c/buildlink3.mk | 25 +++++++++++++++
lang/gcc3-c/language.mk | 12 +++++++
lang/gcc3-f77/DESCR | 15 +--------
lang/gcc3-f77/Makefile | 28 ++++++++---------
lang/gcc3-f77/buildlink2.mk | 35 ++++++++++++++++++++++
lang/gcc3-f77/buildlink3.mk | 25 +++++++++++++++
lang/gcc3-java/DESCR | 15 +--------
lang/gcc3-java/Makefile | 33 ++++++++++----------
lang/gcc3-java/buildlink2.mk | 35 ++++++++++++++++++++++
lang/gcc3-java/buildlink3.mk | 25 +++++++++++++++
lang/gcc3-objc/DESCR | 15 +--------
lang/gcc3-objc/Makefile | 17 +++++-----
lang/gcc3-objc/buildlink2.mk | 35 ++++++++++++++++++++++
lang/gcc3-objc/buildlink3.mk | 25 +++++++++++++++
25 files changed, 446 insertions(+), 219 deletions(-)
diffs (truncated from 943 to 300 lines):
diff -r 77324de23069 -r f9afcdf474b9 lang/gcc3-ada/DESCR
--- a/lang/gcc3-ada/DESCR Sun Feb 01 13:05:23 2004 +0000
+++ b/lang/gcc3-ada/DESCR Sun Feb 01 14:05:46 2004 +0000
@@ -1,14 +1,3 @@
-This directory contains the GNU Compiler Collection (GCC) version 3.3.
-It includes all of the support for compiling C, C++, Objective C, Fortran,
-Java, and Chill.
-
-The GNU Compiler Collection is free software. See the file COPYING for copying
-permission.
+The GNU Compiler Collection (GCC) version 3.x.
-See the file gcc.texi (together with other files that it includes) for
-installation and porting information. The file INSTALL contains a
-copy of the installation information, as plain ASCII.
-
-See the Bugs chapter of the GCC Manual for how to report bugs
-usefully. An online readable version of the manual is in the files
-gcc.info*.
+This package includes support for compiling the Ada language.
diff -r 77324de23069 -r f9afcdf474b9 lang/gcc3-ada/Makefile
--- a/lang/gcc3-ada/Makefile Sun Feb 01 13:05:23 2004 +0000
+++ b/lang/gcc3-ada/Makefile Sun Feb 01 14:05:46 2004 +0000
@@ -1,37 +1,38 @@
-# $NetBSD: Makefile,v 1.8 2003/12/08 18:33:53 drochner Exp $
-#
+# $NetBSD: Makefile,v 1.9 2004/02/01 14:05:46 jlam Exp $
-PKGNAME= gcc3${GCC3_PKGMODIF}-ada-${GCC_VERSION}
-COMMENT= GNU Compiler Collection, version 3, Ada compiler
+PKGNAME= gcc3${GCC3_PKGMODIF}-ada-${GCC_VERSION}
+COMMENT= GNU Compiler Collection, v3 - Ada compiler
INFO_FILES= gnat_ug_unx.info gnat_ug_vms.info gnat_ug_vxw.info
INFO_FILES+= gnat_ug_wnt.info gnat_rm.info gnat-style.info
-.include "../../lang/gcc3-c/buildaddon.mk"
+.include "../gcc3-c/language.mk"
-PTHREAD_OPTS+= require native
+PTHREAD_OPTS+= require native
CONFIGURE_ARGS+= --enable-languages="ada"
CONFIGURE_ARGS+= --enable-threads=yes
#
-# Bootstrap section. Define something to make the pkg usable.
+# Bootstrap section. Define something to make the package usable.
+#
+# To make things more interesting, we need an existing GCC with Ada
+# support to build Ada support.
#
-# To make things more interesting, we need a gcc with ada support to build
-# ada support.
# A gcc tree with compiler driver and gnatbind should be in ADA_BOOT_PATH.
-#ADA_BOOT_PATH= /path/to/adagcc
-# Use this if a special compiler driver is needed to compile ada programs
-# (as seen in linux installations).
+#
+#ADA_BOOT_PATH= /path/to/adagcc
+#
+# Use this if a special compiler driver is needed to compile Ada programs
+# (as seen in Linux installations).
+#
#GNATGCC_ADA_DRIVER= gnatgcc
.if defined(ADA_BOOT_PATH)
-
-.if defined(GNATGCC_ADA_DRIVER)
+. if defined(GNATGCC_ADA_DRIVER)
ADA_BOOT_ADAC= ${ADA_BOOT_PATH}/bin/${GNATGCC_ADA_DRIVER}
-.else
+. else
ADA_BOOT_ADAC= ${ADA_BOOT_PATH}/bin/gcc
-.endif
-
+. endif
ADA_BOOT_GNATBIND= ${ADA_BOOT_PATH}/bin/gnatbind
EXTRA_ENV+= ADAC=${ADA_BOOT_ADAC:Q}
@@ -40,8 +41,7 @@
.else # !ADA_BOOT_PATH
-# XXX No known system has ada in the main tree.
-ONLY_FOR_PLATFORM= sorry_need_ada_compiler
+PKG_SKIP_REASON= "Sorry, need an Ada compiler"
.endif # ADA_BOOT_PATH
@@ -50,28 +50,28 @@
#
post-patch:
- (cd files; \
- ${CP} adasignal.c ${WRKSRC}/gcc/ada; \
- ${CP} ada_lwp_self.c ${WRKSRC}/gcc/ada; \
- for i in *.adb *.ads ; do \
- ${CP} $$i ${WRKSRC}/gcc/ada; \
- done )
+ cd ${FILESDIR}; \
+ ${CP} adasignal.c ${WRKSRC}/gcc/ada; \
+ ${CP} ada_lwp_self.c ${WRKSRC}/gcc/ada; \
+ for i in *.adb *.ads ; do \
+ ${CP} $$i ${WRKSRC}/gcc/ada; \
+ done
post-buildlink:
${LN} -sf ${ADA_BOOT_GNATBIND} ${BUILDLINK_DIR}/bin
post-configure:
${TEST} -f ${WRKSRC}/gcc/ada/Makefile \
- || ${FALSE} # no ada bootstrap found by configure
- (cd ${WRKSRC}/gcc/ada && ${TOUCH} treeprs.ads [es]info.h nmake.ad[bs])
+ || ${FALSE} # no ada bootstrap found by configure
+ cd ${WRKSRC}/gcc/ada && ${TOUCH} treeprs.ads [es]info.h nmake.ad[bs]
do-build:
- (cd ${WRKSRC}/gcc && ${SETENV} ${MAKE_ENV} ${GMAKE} ada)
+ cd ${WRKSRC}/gcc && ${SETENV} ${MAKE_ENV} ${GMAKE} ada
# XXX avoid some VPATH related lossage
- (cd ${WRKSRC}/gcc/ada && ${MV} targtyps.o targtyps.o.sav)
- (cd ${WRKSRC}/gcc/ada && ${RM} -f *.o *.ali)
- (cd ${WRKSRC}/gcc/ada && ${MV} targtyps.o.sav targtyps.o)
- (cd ${WRKSRC}/gcc && ${SETENV} ${MAKE_ENV} ${GMAKE} gnatlib_and_tools)
+ cd ${WRKSRC}/gcc/ada && ${MV} targtyps.o targtyps.o.sav
+ cd ${WRKSRC}/gcc/ada && ${RM} -f *.o *.ali
+ cd ${WRKSRC}/gcc/ada && ${MV} targtyps.o.sav targtyps.o
+ cd ${WRKSRC}/gcc && ${SETENV} ${MAKE_ENV} ${GMAKE} gnatlib_and_tools
post-build:
@${SED} ${FILES_SUBST_SED} ${FILESDIR}/gcc3.mk > ${WRKDIR}/gcc3.mk
@@ -79,12 +79,12 @@
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/gcc/gnat1 ${GCC_ARCHDIR}
- (cd ${WRKSRC}/gcc && ${SETENV} ${MAKE_ENV} ${GMAKE} \
- ada.install-common ada.install-info install-gnatlib)
+ cd ${WRKSRC}/gcc && ${SETENV} ${MAKE_ENV} ${GMAKE} \
+ ada.install-common ada.install-info install-gnatlib
${RM} -f ${GCC_ARCHDIR}/adalib/lib*.so
post-install:
${INSTALL_DATA} ${WRKDIR}/gcc3.mk ${GCC_PREFIX}/mk/ada.mk
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 77324de23069 -r f9afcdf474b9 lang/gcc3-c++/DESCR
--- a/lang/gcc3-c++/DESCR Sun Feb 01 13:05:23 2004 +0000
+++ b/lang/gcc3-c++/DESCR Sun Feb 01 14:05:46 2004 +0000
@@ -1,14 +1,3 @@
-This directory contains the GNU Compiler Collection (GCC) version 3.3.
-It includes all of the support for compiling C, C++, Objective C, Fortran,
-Java, and Chill.
-
-The GNU Compiler Collection is free software. See the file COPYING for copying
-permission.
+The GNU Compiler Collection (GCC) version 3.x.
-See the file gcc.texi (together with other files that it includes) for
-installation and porting information. The file INSTALL contains a
-copy of the installation information, as plain ASCII.
-
-See the Bugs chapter of the GCC Manual for how to report bugs
-usefully. An online readable version of the manual is in the files
-gcc.info*.
+This package includes support for compiling the C++ language.
diff -r 77324de23069 -r f9afcdf474b9 lang/gcc3-c++/Makefile
--- a/lang/gcc3-c++/Makefile Sun Feb 01 13:05:23 2004 +0000
+++ b/lang/gcc3-c++/Makefile Sun Feb 01 14:05:46 2004 +0000
@@ -1,27 +1,26 @@
-# $NetBSD: Makefile,v 1.7 2003/08/11 14:16:02 drochner Exp $
-#
+# $NetBSD: Makefile,v 1.8 2004/02/01 14:05:47 jlam Exp $
-PKGNAME= gcc3${GCC3_PKGMODIF}-c++-${GCC_VERSION}
-COMMENT= GNU Compiler Collection, version 3, c++ compiler
+PKGNAME= gcc3${GCC3_PKGMODIF}-c++-${GCC_VERSION}
+COMMENT= GNU Compiler Collection, v3 - C++ compiler
-.include "../gcc3-c/buildaddon.mk"
+.include "../gcc3-c/language.mk"
CONFIGURE_ARGS+= --enable-languages="c++"
do-build:
- (cd ${WRKSRC}/gcc && ${SETENV} ${MAKE_ENV} ${GMAKE} c++)
- (cd ${WRKSRC}/gcc && ${SETENV} ${MAKE_ENV} ${GMAKE} g++)
- (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} all-target-libstdc++-v3)
+ cd ${WRKSRC}/gcc && ${SETENV} ${MAKE_ENV} ${GMAKE} c++
+ cd ${WRKSRC}/gcc && ${SETENV} ${MAKE_ENV} ${GMAKE} g++
+ cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} all-target-libstdc++-v3
post-build:
@${SED} ${FILES_SUBST_SED} ${FILESDIR}/gcc3.mk > ${WRKDIR}/gcc3.mk
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/gcc/cc1plus ${GCC_ARCHDIR}
- (cd ${WRKSRC}/gcc && ${SETENV} ${MAKE_ENV} ${GMAKE} \
- c++.install-common c++.install-man)
- (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} \
- install-target-libstdc++-v3)
+ cd ${WRKSRC}/gcc && ${SETENV} ${MAKE_ENV} ${GMAKE} \
+ c++.install-common c++.install-man
+ cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} \
+ install-target-libstdc++-v3
post-install:
${INSTALL_DATA} ${WRKDIR}/gcc3.mk ${GCC_PREFIX}/mk/c++.mk
diff -r 77324de23069 -r f9afcdf474b9 lang/gcc3-c++/buildlink2.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/gcc3-c++/buildlink2.mk Sun Feb 01 14:05:46 2004 +0000
@@ -0,0 +1,45 @@
+# $NetBSD: buildlink2.mk,v 1.1 2004/02/01 14:05:47 jlam Exp $
+
+.if !defined(GCC3CXX_BUILDLINK2_MK)
+GCC3CXX_BUILDLINK2_MK= # defined
+
+.include "../../mk/bsd.prefs.mk"
+
+.if defined(GCC3_INSTALLTO_SUBPREFIX)
+GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX}
+.endif
+BUILDLINK_PACKAGES+= gcc3cxx
+BUILDLINK_DEPENDS.gcc3cxx?= gcc3${GCC3_PKGMODIF}-c++>=${_GCC_REQD}
+BUILDLINK_PKGSRCDIR.gcc3cxx?= ../../lang/gcc3-c++
+
+# Packages that link against gcc shared libraries need a full
+# dependency.
+#
+.if defined(USE_GCC_SHLIB)
+BUILDLINK_DEPMETHOD.gcc3cxx+= full
+.else
+BUILDLINK_DEPMETHOD.gcc3cxx?= build
+.endif
+
+BUILDLINK_PREFIX.gcc3cxx= ${LOCALBASE}
+BUILDLINK_WRAPPER_ENV+= \
+ COMPILER_PATH="${BUILDLINK_DIR}/bin"; export COMPILER_PATH
+
+BUILDLINK_FILES.gcc3cxx= ${_GCC_SUBPREFIX}include/c++/*/*
+BUILDLINK_FILES.gcc3cxx+= ${_GCC_SUBPREFIX}include/c++/*/*/*
+BUILDLINK_FILES.gcc3cxx+= ${_GCC_SUBPREFIX}include/c++/*/*/*/*
+BUILDLINK_FILES.gcc3cxx+= ${_GCC_SUBPREFIX}lib/libstdc++.*
+BUILDLINK_FILES.gcc3cxx+= ${_GCC_SUBPREFIX}lib/libsupc++.*
+
+BUILDLINK_TARGETS+= gcc3cxx-buildlink
+BUILDLINK_TARGETS+= libstdc++-buildlink-la
+
+gcc3cxx-buildlink: _BUILDLINK_USE
+
+libstdc++-buildlink-la:
+ ${_PKG_SILENT}${_PKG_DEBUG} \
+ lafile="${BUILDLINK_DIR}/lib/libstdc++.la"; \
+ libpattern="/usr/lib/libstdc++.*"; \
+ ${BUILDLINK_FAKE_LA}
+
+.endif # GCC3CXX_BUILDLINK2_MK
diff -r 77324de23069 -r f9afcdf474b9 lang/gcc3-c++/buildlink3.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/gcc3-c++/buildlink3.mk Sun Feb 01 14:05:46 2004 +0000
@@ -0,0 +1,25 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/01 14:05:47 jlam Exp $
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+GCC3CXX_BUILDLINK3_MK:= ${GCC3CXX_BUILDLINK3_MK}+
+
+.include "../../mk/bsd.prefs.mk"
+
+.if !empty(GCC3CXX_BUILDLINK3_MK:M+)
+. if defined(GCC3_INSTALLTO_SUBPREFIX)
+GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX}
+. endif
+BUILDLINK_PACKAGES+= gcc3cxx
+BUILDLINK_DEPENDS+= gcc3cxx
+BUILDLINK_DEPENDS.gcc3cxx+= gcc3${GCC3_PKGMODIF}-c++>=${_GCC_REQD}
+BUILDLINK_PKGSRCDIR.gcc3cxx?= ../../lang/gcc3-c++
+
+# Packages that link against shared libraries need a full dependency.
+. if defined(USE_GCC_SHLIB)
+BUILDLINK_DEPMETHOD.gcc3cxx+= full
+. else
+BUILDLINK_DEPMETHOD.gcc3cxx?= build
+. endif
+.endif # GCC3CXX_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r 77324de23069 -r f9afcdf474b9 lang/gcc3-c/DESCR
--- a/lang/gcc3-c/DESCR Sun Feb 01 13:05:23 2004 +0000
+++ b/lang/gcc3-c/DESCR Sun Feb 01 14:05:46 2004 +0000
@@ -1,14 +1,3 @@
-This directory contains the GNU Compiler Collection (GCC) version 3.3.
-It includes all of the support for compiling C, C++, Objective C, Fortran,
-Java, and Chill.
-
-The GNU Compiler Collection is free software. See the file COPYING for copying
-permission.
+The GNU Compiler Collection (GCC) version 3.x.
-See the file gcc.texi (together with other files that it includes) for
Home |
Main Index |
Thread Index |
Old Index