summaryrefslogtreecommitdiff
path: root/lang/gcc47
diff options
context:
space:
mode:
authoradam <adam>2013-02-05 07:12:23 +0000
committeradam <adam>2013-02-05 07:12:23 +0000
commit46af33cb66a84ce819adba21fdc620d53e6001c4 (patch)
treedf1b0a891ade8bcf20e1cfcb324e587728382703 /lang/gcc47
parente2024b96383f2e7e3c1956da33be5534fe44fefd (diff)
downloadpkgsrc-46af33cb66a84ce819adba21fdc620d53e6001c4.tar.gz
Fixed building on Darwin; pkglint cosmetics
Diffstat (limited to 'lang/gcc47')
-rw-r--r--lang/gcc47/Makefile30
-rw-r--r--lang/gcc47/options.mk6
2 files changed, 19 insertions, 17 deletions
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index c7cbf6039ac..a3c8000961d 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -1,22 +1,22 @@
-# $NetBSD: Makefile,v 1.13 2013/01/31 20:07:17 marino Exp $
+# $NetBSD: Makefile,v 1.14 2013/02/05 07:12:23 adam Exp $
GCC_PKGNAME= gcc47
.include "version.mk"
-DISTNAME= gcc-${GCC_DIST_VERSION}
-PKGNAME= ${GCC_PKGNAME}-${GCC_DIST_VERSION}
+DISTNAME= gcc-${GCC_DIST_VERSION}
+PKGNAME= ${GCC_PKGNAME}-${GCC_DIST_VERSION}
## When bumping the PKGREVISION of this package the PKGREVISION of
## lang/gcc47-libs needs to be bump to be at least 1 more than the
## PKGREVISION of this package!
-PKGREVISION= 1
-CATEGORIES= lang
-MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC_DIST_VERSION}/}
-EXTRACT_SUFX= .tar.bz2
+PKGREVISION= 1
+CATEGORIES= lang
+MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC_DIST_VERSION}/}
+EXTRACT_SUFX= .tar.bz2
-MAINTAINER= sbd@NetBSD.org
-HOMEPAGE= http://gcc.gnu.org/
-COMMENT= The GNU Compiler Collection (GCC) - 4.7 Release Series
-LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
+MAINTAINER= sbd@NetBSD.org
+HOMEPAGE= http://gcc.gnu.org/
+COMMENT= The GNU Compiler Collection (GCC) - 4.7 Release Series
+LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
DISTFILES= ${DEFAULT_DISTFILES}
EXTRACT_ONLY= ${DEFAULT_DISTFILES}
@@ -45,10 +45,12 @@ LANGS= c
## The Library rpath to use in end programs.
LDFLAGS_FOR_TARGET= ${LDFLAGS:M${COMPILER_RPATH_FLAG}*:N*/usr/lib*}
-## The "-static-libstdc++ -static-libgcc" flags are normally added to the
-## boot-ldflags by configure but because we are supply the boot-ldflags
-## we mash supply them.
+# The "-static-libstdc++ -static-libgcc" flags are normally added to the
+# boot-ldflags by configure but because we are supply the boot-ldflags
+# we mash supply them.
BOOT_LDFLAGS= -static-libstdc++ -static-libgcc ${LDFLAGS_FOR_TARGET}
+# Needed on Darwin when LDFLAGS point to a SDK
+BOOT_LDFLAGS+= ${LDFLAGS:M-Wl,-syslibroot*}
## For target librarys and libjava programs.
CONFIGURE_ENV+= LDFLAGS_FOR_TARGET=${LDFLAGS_FOR_TARGET:Q}
diff --git a/lang/gcc47/options.mk b/lang/gcc47/options.mk
index 3d2604ebdc2..02f39fee7c8 100644
--- a/lang/gcc47/options.mk
+++ b/lang/gcc47/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2012/08/20 07:22:09 sbd Exp $
+# $NetBSD: options.mk,v 1.9 2013/02/05 07:12:23 adam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.${GCC_PKGNAME}
PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-c++ gcc-fortran gcc-java \
@@ -28,8 +28,8 @@ MULTILIB_SUPPORTED=Yes
. endif
.endif
.if !empty(MULTILIB_SUPPORTED:M[Yy][Ee][Ss])
-PKG_SUPPORTED_OPTIONS+= gcc-multilib
-PKG_SUGGESTED_OPTIONS+= gcc-multilib
+PKG_SUPPORTED_OPTIONS+= gcc-multilib
+PKG_SUGGESTED_OPTIONS+= gcc-multilib
.endif
.include "../../mk/bsd.options.mk"