diff options
| author | grant <grant> | 2003-05-29 23:14:07 +0000 |
|---|---|---|
| committer | grant <grant> | 2003-05-29 23:14:07 +0000 |
| commit | ee816425f3e1744278d353bbbcff42611f8f20b3 (patch) | |
| tree | 2ab39a00d70ddd1fe87ded8ec8941560f6ff8dee /lang | |
| parent | 6d140306195b275b74f3eb1a512dad0797c70f61 (diff) | |
| download | pkgsrc-ee816425f3e1744278d353bbbcff42611f8f20b3.tar.gz | |
s/USE_CXX/USE_GCC_SHLIB/ - there are more shared libraries than just
libstdc++ in gcc3.
when defined, USE_GCC_SHLIB ensures that the correct rpath is passed
to the linker, and a full dependency on the compiler package is
registered.
packages which define USE_GCC_SHLIB should not include
mk/gcc.buildlink2.mk (or gcc{,3}/buildlink2.mk) as it is handled
automatically.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/gcc/buildlink2.mk | 10 | ||||
| -rw-r--r-- | lang/gcc3/buildlink2.mk | 10 | ||||
| -rw-r--r-- | lang/jikes/Makefile | 5 |
3 files changed, 12 insertions, 13 deletions
diff --git a/lang/gcc/buildlink2.mk b/lang/gcc/buildlink2.mk index 5021a750473..68d4b1c0dd3 100644 --- a/lang/gcc/buildlink2.mk +++ b/lang/gcc/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.10 2003/05/28 13:24:36 grant Exp $ +# $NetBSD: buildlink2.mk,v 1.11 2003/05/29 23:14:12 grant Exp $ .if !defined(GCC2_BUILDLINK2_MK) GCC2_BUILDLINK2_MK= # defined @@ -12,10 +12,10 @@ GCC_REQD?= 2.95.3 BUILDLINK_DEPENDS.gcc?= gcc>=${GCC_REQD} BUILDLINK_PKGSRCDIR.gcc?= ../../lang/gcc -# Packages that use the C++ compiler and subsequently link against the -# shared libstdc++ from the package need a full dependency. +# Packages that link against shared gcc libraries need a full +# dependency. # -.if defined(USE_CXX) +.if defined(USE_GCC_SHLIB) BUILDLINK_DEPMETHOD.gcc+= full .else BUILDLINK_DEPMETHOD.gcc?= build @@ -69,7 +69,7 @@ CXX= ${_GCC_PREFIX}bin/g++ F77= ${_GCC_PREFIX}bin/g77 PKG_FC= ${F77} -. if defined(USE_CXX) +. if defined(USE_GCC_SHLIB) LDFLAGS+= ${BUILDLINK_LDFLAGS.gcc} . endif BUILDLINK_WRAPPER_ENV+= \ diff --git a/lang/gcc3/buildlink2.mk b/lang/gcc3/buildlink2.mk index 97e3dd037f3..b8dd8572392 100644 --- a/lang/gcc3/buildlink2.mk +++ b/lang/gcc3/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.2 2003/05/28 13:24:35 grant Exp $ +# $NetBSD: buildlink2.mk,v 1.3 2003/05/29 23:14:12 grant Exp $ .if !defined(GCC3_BUILDLINK2_MK) GCC3_BUILDLINK2_MK= # defined @@ -9,10 +9,10 @@ GCC_REQD?= 3.3 BUILDLINK_DEPENDS.gcc?= gcc3>=${GCC_REQD} BUILDLINK_PKGSRCDIR.gcc?= ../../lang/gcc3 -# Packages that use the C++ compiler and subsequently link against the -# shared libstdc++ from the package need a full dependency. +# Packages that link against gcc shared libraries need a full +# dependency. # -.if defined(USE_CXX) +.if defined(USE_GCC_SHLIB) BUILDLINK_DEPMETHOD.gcc+= full .else BUILDLINK_DEPMETHOD.gcc?= build @@ -57,7 +57,7 @@ CXX= ${_GCC_PREFIX}bin/g++ F77= ${_GCC_PREFIX}bin/g77 PKG_FC= ${F77} -. if defined(USE_CXX) +. if defined(USE_GCC_SHLIB) LDFLAGS+= ${BUILDLINK_LDFLAGS.gcc} . endif BUILDLINK_WRAPPER_ENV+= \ diff --git a/lang/jikes/Makefile b/lang/jikes/Makefile index 0ede5428e5b..0e4287b93d2 100644 --- a/lang/jikes/Makefile +++ b/lang/jikes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2003/05/23 01:50:30 jschauma Exp $ +# $NetBSD: Makefile,v 1.15 2003/05/29 23:14:09 grant Exp $ # DISTNAME= jikes-1.18 @@ -14,10 +14,9 @@ ONLY_FOR_PLATFORM= NetBSD-*-* SunOS-*-* Linux-*-* USE_BUILDLINK2= yes GNU_CONFIGURE= yes -USE_CXX= yes +USE_GCC_SHLIB= yes UNLIMIT_RESOURCES= datasize USE_GMAKE= # uses multi-line comments with \ (naughty hack!) -.include "../../lang/gcc/buildlink2.mk" .include "../../mk/bsd.pkg.mk" |