summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2017-05-10 15:02:29 +0000
committerjperkin <jperkin@pkgsrc.org>2017-05-10 15:02:29 +0000
commit30cb9fe15fa9ac28e84fefb429ee9a21370636bc (patch)
tree54d2252fdc054f62a8008011bffc467c6758036d /lang
parent7f852ecc102e10c217ac6eebb76e736168578383 (diff)
downloadpkgsrc-30cb9fe15fa9ac28e84fefb429ee9a21370636bc.tar.gz
Remove leftovers from the gcc-java option which were bringing in more
dependencies than required and causing the build to fail due to being unable to find zlib. Bump PKGREVISION.
Diffstat (limited to 'lang')
-rw-r--r--lang/gcc7/Makefile4
-rw-r--r--lang/gcc7/options.mk8
2 files changed, 3 insertions, 9 deletions
diff --git a/lang/gcc7/Makefile b/lang/gcc7/Makefile
index d65cee1f853..bdcac11e6cd 100644
--- a/lang/gcc7/Makefile
+++ b/lang/gcc7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2017/05/04 17:38:23 maya Exp $
+# $NetBSD: Makefile,v 1.3 2017/05/10 15:02:29 jperkin Exp $
GCC_PKGNAME= gcc7
.include "version.mk"
@@ -8,7 +8,7 @@ PKGNAME= ${GCC_PKGNAME}-${GCC7S_DIST_VERSION}
## When bumping the PKGREVISION of this package the PKGREVISION of
## lang/gcc7-libs needs to be bump to be at least 1 more than the
## PKGREVISION of this package!
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC7S_DIST_VERSION}/}
EXTRACT_SUFX= .tar.bz2
diff --git a/lang/gcc7/options.mk b/lang/gcc7/options.mk
index c260650a2cb..d7d18109905 100644
--- a/lang/gcc7/options.mk
+++ b/lang/gcc7/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2017/05/03 00:21:03 maya Exp $
+# $NetBSD: options.mk,v 1.2 2017/05/10 15:02:29 jperkin Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.${GCC_PKGNAME}
PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-c++ gcc-fortran \
@@ -107,12 +107,6 @@ LANGS+= obj-c++
LANGS+= objc
.endif
-USE_TOOLS+= unzip zip:run gmake:run
-CONFIGURE_ARGS+= --with-system-zlib
-
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../lang/python/application.mk"
-
.if !empty(PKG_OPTIONS:Mgcc-go)
LANGS+= go
.endif