summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorryoon <ryoon>2014-04-23 11:05:21 +0000
committerryoon <ryoon>2014-04-23 11:05:21 +0000
commit96484269762fad57e5c59354bb5730d96a3db9ca (patch)
tree475c502996d75e44fe6d633de93722660af2ce26 /lang
parent732ac8d5fa190cc37efb5073121513b336aefeda (diff)
downloadpkgsrc-96484269762fad57e5c59354bb5730d96a3db9ca.tar.gz
Bump PKGREVISION of gcc48-libs
Disable Java libraries by default.
Diffstat (limited to 'lang')
-rw-r--r--lang/gcc48-libs/Makefile4
-rw-r--r--lang/gcc48/options.mk6
2 files changed, 4 insertions, 6 deletions
diff --git a/lang/gcc48-libs/Makefile b/lang/gcc48-libs/Makefile
index b7d4efd818e..aebf3718b34 100644
--- a/lang/gcc48-libs/Makefile
+++ b/lang/gcc48-libs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2014/04/22 20:46:41 ryoon Exp $
+# $NetBSD: Makefile,v 1.12 2014/04/23 11:05:21 ryoon Exp $
PKGNAME= ${GCC_PKGNAME}-libs-${GCC48_DIST_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
COMMENT= Runtime libraries from the GNU Compiler Collection (GCC) 4.8
diff --git a/lang/gcc48/options.mk b/lang/gcc48/options.mk
index 2a87c39d885..2b168af8c2f 100644
--- a/lang/gcc48/options.mk
+++ b/lang/gcc48/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2014/04/22 20:46:41 ryoon Exp $
+# $NetBSD: options.mk,v 1.3 2014/04/23 11:05:21 ryoon Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.${GCC_PKGNAME}
PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-graphite gcc-java
@@ -7,9 +7,7 @@ PKG_SUGGESTED_OPTIONS= gcc-graphite
.include "../../mk/bsd.prefs.mk"
# amd64 is for OpenBSD/amd64
-.if (!empty(MACHINE_ARCH:Mx86_64) || !empty(MACHINE_ARCH:Mamd64) || \
- !empty(MACHINE_ARCH:Mi386)) && \
- (!empty(PKGPATH:Mlang/gcc48-libs) || !empty(PKGPATH:Mlang/gcc48-java))
+.if !empty(PKG_OPTIONS:Mgcc-java)
.include "../../lang/gcc48/java.mk"
PKG_SUGGESTED_OPTIONS+= gcc-java
PLIST.java= yes