diff options
Diffstat (limited to 'lang/gcc47')
| -rw-r--r-- | lang/gcc47/Makefile | 4 | ||||
| -rw-r--r-- | lang/gcc47/buildlink3.mk | 9 | ||||
| -rw-r--r-- | lang/gcc47/options.mk | 7 |
3 files changed, 7 insertions, 13 deletions
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile index 2284202e678..a283c3e67c2 100644 --- a/lang/gcc47/Makefile +++ b/lang/gcc47/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2012/07/23 12:47:55 jperkin Exp $ +# $NetBSD: Makefile,v 1.6 2012/08/20 07:22:09 sbd Exp $ GCC_PKGNAME= gcc47 .include "version.mk" @@ -130,4 +130,6 @@ GENERATE_PLIST+= \ cd ${DESTDIR}${PREFIX} && \ ${FIND} ${GCC_SUBPREFIX} \( -type f -o -type l \) -print | ${SORT} ; +.include "../../mk/dlopen.buildlink3.mk" +.include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/gcc47/buildlink3.mk b/lang/gcc47/buildlink3.mk index be37152843e..6f53db9f8d5 100644 --- a/lang/gcc47/buildlink3.mk +++ b/lang/gcc47/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2012/08/20 07:19:12 sbd Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2012/08/20 07:22:09 sbd Exp $ BUILDLINK_TREE+= gcc47 @@ -33,14 +33,11 @@ BUILDLINK_DEPMETHOD.gcc47?= build pkgbase := gcc47 .include "../../mk/pkg-build-options.mk" -.if !empty(PKG_BUILD_OPTIONS.gcc47:Mgcc-java) || \ - !empty(PKG_BUILD_OPTIONS.gcc47:Mgcc-go) -.include "../../mk/pthread.buildlink3.mk" -.endif .if !empty(PKG_BUILD_OPTIONS.gcc47:Mgcc-java) .include "../../devel/zlib/buildlink3.mk" -.include "../../mk/dlopen.buildlink3.mk" .endif +.include "../../mk/dlopen.buildlink3.mk" +.include "../../mk/pthread.buildlink3.mk" .endif # GCC47_BUILDLINK3_MK BUILDLINK_TREE+= -gcc47 diff --git a/lang/gcc47/options.mk b/lang/gcc47/options.mk index d01e8cb73a0..3d2604ebdc2 100644 --- a/lang/gcc47/options.mk +++ b/lang/gcc47/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.7 2012/06/23 22:13:02 marino Exp $ +# $NetBSD: options.mk,v 1.8 2012/08/20 07:22:09 sbd Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.${GCC_PKGNAME} PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-c++ gcc-fortran gcc-java \ @@ -147,7 +147,6 @@ MAKE_ENV+= ac_cv_prog_JAR=no .include "../../devel/zlib/buildlink3.mk" .include "../../lang/python/application.mk" -.include "../../mk/dlopen.buildlink3.mk" .include "../../mk/java-env.mk" .endif @@ -155,10 +154,6 @@ MAKE_ENV+= ac_cv_prog_JAR=no LANGS+= go .endif -.if !empty(PKG_OPTIONS:Mgcc-java) || !empty(PKG_OPTIONS:Mgcc-go) -.include "../../mk/pthread.buildlink3.mk" -.endif - .if !empty(PKG_OPTIONS:Mgcc-fortran) LANGS+= fortran .endif |