Thu Jun 22 21:44:50 2017 UTC ()
Restrict gcc gsed usage to NetBSD
(NetBSD/mips64 progress further with gsed)

Adding gsed as a tool creates circular dependencies if pkgsrc gcc is used
as the bootstrap compiler.

Pointed out by jperkin, sorry.


(maya)
diff -r1.33 -r1.34 pkgsrc/lang/gcc48/Makefile
diff -r1.17 -r1.18 pkgsrc/lang/gcc49/Makefile
diff -r1.18 -r1.19 pkgsrc/lang/gcc5/Makefile
diff -r1.5 -r1.6 pkgsrc/lang/gcc6/Makefile
diff -r1.6 -r1.7 pkgsrc/lang/gcc7/Makefile

cvs diff -r1.33 -r1.34 pkgsrc/lang/gcc48/Attic/Makefile (switch to unified diff)

--- pkgsrc/lang/gcc48/Attic/Makefile 2017/06/21 21:16:35 1.33
+++ pkgsrc/lang/gcc48/Attic/Makefile 2017/06/22 21:44:49 1.34
@@ -1,175 +1,176 @@ @@ -1,175 +1,176 @@
1# $NetBSD: Makefile,v 1.33 2017/06/21 21:16:35 maya Exp $ 1# $NetBSD: Makefile,v 1.34 2017/06/22 21:44:49 maya Exp $
2 2
3GCC_PKGNAME= gcc48 3GCC_PKGNAME= gcc48
4.include "version.mk" 4.include "version.mk"
5 5
6DISTNAME= gcc-${GCC48_DIST_VERSION} 6DISTNAME= gcc-${GCC48_DIST_VERSION}
7PKGNAME= ${GCC_PKGNAME}-${GCC48_DIST_VERSION} 7PKGNAME= ${GCC_PKGNAME}-${GCC48_DIST_VERSION}
8## When bumping the PKGREVISION of this package the PKGREVISION of 8## When bumping the PKGREVISION of this package the PKGREVISION of
9## lang/gcc48-libs needs to be bump to be at least 1 more than the 9## lang/gcc48-libs needs to be bump to be at least 1 more than the
10## PKGREVISION of this package! 10## PKGREVISION of this package!
11PKGREVISION= 1 11PKGREVISION= 1
12CATEGORIES= lang 12CATEGORIES= lang
13MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC48_DIST_VERSION}/} 13MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC48_DIST_VERSION}/}
14EXTRACT_SUFX= .tar.bz2 14EXTRACT_SUFX= .tar.bz2
15 15
16MAINTAINER= maya@NetBSD.org 16MAINTAINER= maya@NetBSD.org
17HOMEPAGE= http://gcc.gnu.org/ 17HOMEPAGE= http://gcc.gnu.org/
18COMMENT= The GNU Compiler Collection (GCC) - 4.8 Release Series 18COMMENT= The GNU Compiler Collection (GCC) - 4.8 Release Series
19LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3 19LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
20 20
21DISTFILES= ${DEFAULT_DISTFILES} 21DISTFILES= ${DEFAULT_DISTFILES}
22EXTRACT_ONLY= ${DEFAULT_DISTFILES} 22EXTRACT_ONLY= ${DEFAULT_DISTFILES}
23 23
24NOT_FOR_PLATFORM= Interix-*-* 24NOT_FOR_PLATFORM= Interix-*-*
25 25
26USE_LANGUAGES= c c++ 26USE_LANGUAGES= c c++
27USE_TOOLS+= gmake makeinfo gsed 27USE_TOOLS+= gmake makeinfo sed:run
 28USE_TOOLS.NetBSD+= gsed
28GNU_CONFIGURE= yes 29GNU_CONFIGURE= yes
29GCC_REQD+= 4.4 30GCC_REQD+= 4.4
30## Build outside ${WRKSRC} 31## Build outside ${WRKSRC}
31OBJDIR= ../build 32OBJDIR= ../build
32CONFIGURE_DIRS= ${OBJDIR} 33CONFIGURE_DIRS= ${OBJDIR}
33CONFIGURE_SCRIPT= ../${DISTNAME}/configure 34CONFIGURE_SCRIPT= ../${DISTNAME}/configure
34GCC_SUBPREFIX= ${GCC_PKGNAME} 35GCC_SUBPREFIX= ${GCC_PKGNAME}
35GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX} 36GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX}
36GCC_TARGET_MACHINE?= ${MACHINE_GNU_PLATFORM} 37GCC_TARGET_MACHINE?= ${MACHINE_GNU_PLATFORM}
37GNU_CONFIGURE_PREFIX= ${GCC_PREFIX} 38GNU_CONFIGURE_PREFIX= ${GCC_PREFIX}
38INFO_FILES= yes 39INFO_FILES= yes
39 40
40UNLIMIT_RESOURCES+= datasize 41UNLIMIT_RESOURCES+= datasize
41UNLIMIT_RESOURCES+= stacksize 42UNLIMIT_RESOURCES+= stacksize
42 43
43SUBST_CLASSES+= vars 44SUBST_CLASSES+= vars
44SUBST_MESSAGE.vars= Setting target machine name path in ${SUBST_FILES.vars} 45SUBST_MESSAGE.vars= Setting target machine name path in ${SUBST_FILES.vars}
45SUBST_STAGE.vars= pre-configure 46SUBST_STAGE.vars= pre-configure
46SUBST_FILES.vars= gcc/Makefile.in 47SUBST_FILES.vars= gcc/Makefile.in
47SUBST_VARS.vars= GCC_TARGET_MACHINE 48SUBST_VARS.vars= GCC_TARGET_MACHINE
48 49
49.include "../../mk/bsd.prefs.mk" 50.include "../../mk/bsd.prefs.mk"
50 51
51LANGS= c 52LANGS= c
52 53
53# In some cases LINKER_RPATH_FLAG needs a trailing space. 54# In some cases LINKER_RPATH_FLAG needs a trailing space.
54LINKER_RPATH_FLAG:= ${LINKER_RPATH_FLAG:S/-rpath/& /} 55LINKER_RPATH_FLAG:= ${LINKER_RPATH_FLAG:S/-rpath/& /}
55 56
56## The Library rpath to use in end programs. 57## The Library rpath to use in end programs.
57LDFLAGS_FOR_TARGET= ${LDFLAGS:M${COMPILER_RPATH_FLAG}*:N*/usr/lib*} 58LDFLAGS_FOR_TARGET= ${LDFLAGS:M${COMPILER_RPATH_FLAG}*:N*/usr/lib*}
58 59
59# The "-static-libstdc++ -static-libgcc" flags are normally added to the 60# The "-static-libstdc++ -static-libgcc" flags are normally added to the
60# boot-ldflags by configure but because we are supply the boot-ldflags 61# boot-ldflags by configure but because we are supply the boot-ldflags
61# we mash supply them. 62# we mash supply them.
62BOOT_LDFLAGS= -static-libstdc++ -static-libgcc ${LDFLAGS_FOR_TARGET} 63BOOT_LDFLAGS= -static-libstdc++ -static-libgcc ${LDFLAGS_FOR_TARGET}
63# Needed on Darwin when LDFLAGS point to a SDK 64# Needed on Darwin when LDFLAGS point to a SDK
64BOOT_LDFLAGS+= ${LDFLAGS:M-Wl,-syslibroot*} 65BOOT_LDFLAGS+= ${LDFLAGS:M-Wl,-syslibroot*}
65# GCC does not understand this option; remove it, or stage build will fail 66# GCC does not understand this option; remove it, or stage build will fail
66BUILDLINK_TRANSFORM+= rm:-stdlib=libc++ 67BUILDLINK_TRANSFORM+= rm:-stdlib=libc++
67 68
68# Ignore missing rpaths in "fake" library. 69# Ignore missing rpaths in "fake" library.
69CHECK_SHLIBS_SKIP+= ${GCC_PKGNAME}/lib*/libgcj_bc.so* 70CHECK_SHLIBS_SKIP+= ${GCC_PKGNAME}/lib*/libgcj_bc.so*
70 71
71## For target librarys and libjava programs. 72## For target librarys and libjava programs.
72CONFIGURE_ENV+= LDFLAGS_FOR_TARGET=${LDFLAGS_FOR_TARGET:Q} 73CONFIGURE_ENV+= LDFLAGS_FOR_TARGET=${LDFLAGS_FOR_TARGET:Q}
73 74
74CONFIGURE_ARGS+= --enable-languages=${LANGS:Q} 75CONFIGURE_ARGS+= --enable-languages=${LANGS:Q}
75CONFIGURE_ARGS+= --enable-shared 76CONFIGURE_ARGS+= --enable-shared
76CONFIGURE_ARGS+= --enable-long-long 77CONFIGURE_ARGS+= --enable-long-long
77CONFIGURE_ARGS+= --with-local-prefix=${GCC_PREFIX:Q} 78CONFIGURE_ARGS+= --with-local-prefix=${GCC_PREFIX:Q}
78 79
79MAKE_ENV.NetBSD+= ac_cv_func_gethostbyname_r=no 80MAKE_ENV.NetBSD+= ac_cv_func_gethostbyname_r=no
80.if !empty(MACHINE_PLATFORM:MNetBSD-*-*) 81.if !empty(MACHINE_PLATFORM:MNetBSD-*-*)
81# use the native SSP code in netbsd libc 82# use the native SSP code in netbsd libc
82CONFIGURE_ARGS+= --disable-libssp 83CONFIGURE_ARGS+= --disable-libssp
83.else 84.else
84CONFIGURE_ARGS+= --enable-libssp 85CONFIGURE_ARGS+= --enable-libssp
85.endif 86.endif
86 87
87CONFIGURE_ARGS+= --enable-threads=posix 88CONFIGURE_ARGS+= --enable-threads=posix
88CONFIGURE_ARGS+= --with-boot-ldflags=${BOOT_LDFLAGS:Q} 89CONFIGURE_ARGS+= --with-boot-ldflags=${BOOT_LDFLAGS:Q}
89 90
90CONFIGURE_ARGS.NetBSD+= --with-gnu-ld --with-ld=/usr/bin/ld 91CONFIGURE_ARGS.NetBSD+= --with-gnu-ld --with-ld=/usr/bin/ld
91CONFIGURE_ARGS.NetBSD+= --with-gnu-as --with-as=/usr/bin/as 92CONFIGURE_ARGS.NetBSD+= --with-gnu-as --with-as=/usr/bin/as
92MAKE_ENV.NetBSD+= ac_cv_func_clock_gettime=yes 93MAKE_ENV.NetBSD+= ac_cv_func_clock_gettime=yes
93 94
94CONFIGURE_ARGS.DragonFly+= --disable-bootstrap 95CONFIGURE_ARGS.DragonFly+= --disable-bootstrap
95 96
96.if ${OPSYS} == "Darwin" && !empty(OSX_SDK_PATH) 97.if ${OPSYS} == "Darwin" && !empty(OSX_SDK_PATH)
97CONFIGURE_ARGS+= --with-native-system-header-dir=${OSX_SDK_PATH}/usr/include 98CONFIGURE_ARGS+= --with-native-system-header-dir=${OSX_SDK_PATH}/usr/include
98# From FreeBSD, avoids compare issues with clang 99# From FreeBSD, avoids compare issues with clang
99CONFIGURE_ARGS+= --with-build-config=bootstrap-debug 100CONFIGURE_ARGS+= --with-build-config=bootstrap-debug
100.endif 101.endif
101 102
102.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || !empty(MACHINE_PLATFORM:MLinux-*-i386) 103.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || !empty(MACHINE_PLATFORM:MLinux-*-i386)
103CONFIGURE_ARGS+= --with-arch=i486 --with-tune=i486 104CONFIGURE_ARGS+= --with-arch=i486 --with-tune=i486
104.endif 105.endif
105 106
106.include "options.mk" 107.include "options.mk"
107 108
108# ${WRKSRC}/fixincludes/ looks for sed and compiles the path to sed into 109# ${WRKSRC}/fixincludes/ looks for sed and compiles the path to sed into
109# a binary so we need to make sure we give it the installed sed and not 110# a binary so we need to make sure we give it the installed sed and not
110# the tool wrapped one. 111# the tool wrapped one.
111MAKE_ENV+= ac_cv_path_SED=${TOOLS_SED} 112MAKE_ENV+= ac_cv_path_SED=${TOOLS_SED}
112MAKE_ENV+= lt_cv_path_SED=${TOOLS_SED} 113MAKE_ENV+= lt_cv_path_SED=${TOOLS_SED}
113 114
114# Determine whether to use binutils 115# Determine whether to use binutils
115.if ${OPSYS} == "SunOS" 116.if ${OPSYS} == "SunOS"
116. if exists(/usr/sfw/bin/gobjdump) 117. if exists(/usr/sfw/bin/gobjdump)
117CONFIGURE_ENV+= OBJDUMP=/usr/sfw/bin/gobjdump 118CONFIGURE_ENV+= OBJDUMP=/usr/sfw/bin/gobjdump
118. endif 119. endif
119. if exists(/usr/bin/ld) 120. if exists(/usr/bin/ld)
120CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/bin/ld 121CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/bin/ld
121. else 122. else
122CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/ccs/bin/ld 123CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/ccs/bin/ld
123. endif 124. endif
124. if exists(/usr/sfw/bin/gas) 125. if exists(/usr/sfw/bin/gas)
125CONFIGURE_ARGS+= --with-gnu-as --with-as=/usr/sfw/bin/gas 126CONFIGURE_ARGS+= --with-gnu-as --with-as=/usr/sfw/bin/gas
126. elif exists(/usr/ccs/bin/as) 127. elif exists(/usr/ccs/bin/as)
127CONFIGURE_ARGS+= --without-gnu-as --with-as=/usr/ccs/bin/as 128CONFIGURE_ARGS+= --without-gnu-as --with-as=/usr/ccs/bin/as
128. else 129. else
129BUILDLINK_DEPMETHOD.binutils= full 130BUILDLINK_DEPMETHOD.binutils= full
130. include "../../devel/binutils/buildlink3.mk" 131. include "../../devel/binutils/buildlink3.mk"
131CONFIGURE_ARGS+= --with-gnu-as --with-as=${PREFIX}/bin/gas 132CONFIGURE_ARGS+= --with-gnu-as --with-as=${PREFIX}/bin/gas
132. endif 133. endif
133.endif 134.endif
134 135
135pre-configure: 136pre-configure:
136.if ${OPSYS} == "OpenBSD" 137.if ${OPSYS} == "OpenBSD"
137 cd ${WRKSRC}/gcc && \ 138 cd ${WRKSRC}/gcc && \
138 patch -p1 < ${FILESDIR}/patch-gcc_targhooks.c-openbsd.diff 139 patch -p1 < ${FILESDIR}/patch-gcc_targhooks.c-openbsd.diff
139.endif 140.endif
140 ${RUN} cd ${WRKSRC} && ${MKDIR} ${OBJDIR} 141 ${RUN} cd ${WRKSRC} && ${MKDIR} ${OBJDIR}
141 142
142TEST_TARGET= -k check || ${TRUE} 143TEST_TARGET= -k check || ${TRUE}
143pre-test: 144pre-test:
144 ${RUN} \ 145 ${RUN} \
145 if runtest --version >/dev/null 2>/dev/null ; then \ 146 if runtest --version >/dev/null 2>/dev/null ; then \
146 : ; \ 147 : ; \
147 else \ 148 else \
148 ${ECHO} "ERROR: Please install devel/dejagnu in order to run the test suite." ; \ 149 ${ECHO} "ERROR: Please install devel/dejagnu in order to run the test suite." ; \
149 exit 1 ; \ 150 exit 1 ; \
150 fi 151 fi
151post-test: 152post-test:
152 ${RUN} cd ${WRKSRC} && cd ${OBJDIR} && \ 153 ${RUN} cd ${WRKSRC} && cd ${OBJDIR} && \
153 ${SHELL} ${WRKSRC}/contrib/test_summary >${WRKDIR}/test_summary.log 154 ${SHELL} ${WRKSRC}/contrib/test_summary >${WRKDIR}/test_summary.log
154 @${INFO_MSG} "Test summary are available in ${WRKDIR}/test_summary.log" 155 @${INFO_MSG} "Test summary are available in ${WRKDIR}/test_summary.log"
155 156
156post-install: 157post-install:
157 ${TEST} -f ${DESTDIR}${GCC_PREFIX}/bin/cc || \ 158 ${TEST} -f ${DESTDIR}${GCC_PREFIX}/bin/cc || \
158 ( cd ${DESTDIR}${GCC_PREFIX}/bin ; ${LN} -f gcc cc ) 159 ( cd ${DESTDIR}${GCC_PREFIX}/bin ; ${LN} -f gcc cc )
159.if !empty(PKG_OPTIONS:Mgcc-java) 160.if !empty(PKG_OPTIONS:Mgcc-java)
160 ${RM} -f ${DESTDIR}${JAVA_HOME}/bin/javadoc 161 ${RM} -f ${DESTDIR}${JAVA_HOME}/bin/javadoc
161 ${RM} -f ${DESTDIR}${JAVA_HOME}/jre/lib/${JAVA_ARCH}/libjawt.so 162 ${RM} -f ${DESTDIR}${JAVA_HOME}/jre/lib/${JAVA_ARCH}/libjawt.so
162.endif 163.endif
163.if !empty(MACHINE_PLATFORM:MSunOS-*-*86*) && ${OS_VERSION} != "5.11" 164.if !empty(MACHINE_PLATFORM:MSunOS-*-*86*) && ${OS_VERSION} != "5.11"
164 ${SH} files/values.c ${DESTDIR}${GCC_PREFIX}/bin/gcc -m32 || ${TRUE} 165 ${SH} files/values.c ${DESTDIR}${GCC_PREFIX}/bin/gcc -m32 || ${TRUE}
165 ${SH} files/values.c ${DESTDIR}${GCC_PREFIX}/bin/gcc -m64 || ${TRUE} 166 ${SH} files/values.c ${DESTDIR}${GCC_PREFIX}/bin/gcc -m64 || ${TRUE}
166.endif 167.endif
167 168
168GENERATE_PLIST+= \ 169GENERATE_PLIST+= \
169 cd ${DESTDIR}${PREFIX} && \ 170 cd ${DESTDIR}${PREFIX} && \
170 ${FIND} ${GCC_SUBPREFIX} \( -type f -o -type l \) -print | ${SORT} ; 171 ${FIND} ${GCC_SUBPREFIX} \( -type f -o -type l \) -print | ${SORT} ;
171 172
172.include "../../converters/libiconv/buildlink3.mk" 173.include "../../converters/libiconv/buildlink3.mk"
173.include "../../mk/dlopen.buildlink3.mk" 174.include "../../mk/dlopen.buildlink3.mk"
174.include "../../mk/pthread.buildlink3.mk" 175.include "../../mk/pthread.buildlink3.mk"
175.include "../../mk/bsd.pkg.mk" 176.include "../../mk/bsd.pkg.mk"

cvs diff -r1.17 -r1.18 pkgsrc/lang/gcc49/Attic/Makefile (switch to unified diff)

--- pkgsrc/lang/gcc49/Attic/Makefile 2017/06/21 21:16:35 1.17
+++ pkgsrc/lang/gcc49/Attic/Makefile 2017/06/22 21:44:49 1.18
@@ -1,197 +1,199 @@ @@ -1,197 +1,199 @@
1# $NetBSD: Makefile,v 1.17 2017/06/21 21:16:35 maya Exp $ 1# $NetBSD: Makefile,v 1.18 2017/06/22 21:44:49 maya Exp $
2 2
3GCC_PKGNAME= gcc49 3GCC_PKGNAME= gcc49
4.include "version.mk" 4.include "version.mk"
5 5
6DISTNAME= gcc-${GCC49_DIST_VERSION} 6DISTNAME= gcc-${GCC49_DIST_VERSION}
7PKGNAME= ${GCC_PKGNAME}-${GCC49_DIST_VERSION} 7PKGNAME= ${GCC_PKGNAME}-${GCC49_DIST_VERSION}
8 8
9## When bumping the PKGREVISION of this package the PKGREVISION of 9## When bumping the PKGREVISION of this package the PKGREVISION of
10## lang/gcc49-libs needs to be bump to be at least 1 more than the 10## lang/gcc49-libs needs to be bump to be at least 1 more than the
11## PKGREVISION of this package! 11## PKGREVISION of this package!
12PKGREVISION= 1 12PKGREVISION= 1
13CATEGORIES= lang 13CATEGORIES= lang
14MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC49_DIST_VERSION}/} 14MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC49_DIST_VERSION}/}
15EXTRACT_SUFX= .tar.bz2 15EXTRACT_SUFX= .tar.bz2
16 16
17MAINTAINER= maya@NetBSD.org 17MAINTAINER= maya@NetBSD.org
18HOMEPAGE= http://gcc.gnu.org/ 18HOMEPAGE= http://gcc.gnu.org/
19COMMENT= The GNU Compiler Collection (GCC) - 4.9 Release Series 19COMMENT= The GNU Compiler Collection (GCC) - 4.9 Release Series
20LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3 20LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
21 21
22DISTFILES= ${DEFAULT_DISTFILES} 22DISTFILES= ${DEFAULT_DISTFILES}
23EXTRACT_ONLY= ${DEFAULT_DISTFILES} 23EXTRACT_ONLY= ${DEFAULT_DISTFILES}
24 24
25NOT_FOR_PLATFORM= Interix-*-* 25NOT_FOR_PLATFORM= Interix-*-*
26 26
27USE_LANGUAGES= c c++ 27USE_LANGUAGES= c c++
28USE_TOOLS+= gmake makeinfo gsed 28USE_TOOLS+= gmake makeinfo sed:run
 29USE_TOOLS.NetBSD+= gsed
 30
29 31
30GNU_CONFIGURE= yes 32GNU_CONFIGURE= yes
31## Build outside ${WRKSRC} 33## Build outside ${WRKSRC}
32OBJDIR= ../build 34OBJDIR= ../build
33CONFIGURE_DIRS= ${OBJDIR} 35CONFIGURE_DIRS= ${OBJDIR}
34CONFIGURE_SCRIPT= ../${DISTNAME}/configure 36CONFIGURE_SCRIPT= ../${DISTNAME}/configure
35GCC_SUBPREFIX= ${GCC_PKGNAME} 37GCC_SUBPREFIX= ${GCC_PKGNAME}
36GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX} 38GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX}
37GCC_TARGET_MACHINE?= ${MACHINE_GNU_PLATFORM} 39GCC_TARGET_MACHINE?= ${MACHINE_GNU_PLATFORM}
38GNU_CONFIGURE_PREFIX= ${GCC_PREFIX} 40GNU_CONFIGURE_PREFIX= ${GCC_PREFIX}
39INFO_FILES= yes 41INFO_FILES= yes
40CONFIGURE_ARGS+= --disable-libstdcxx-pch 42CONFIGURE_ARGS+= --disable-libstdcxx-pch
41 43
42UNLIMIT_RESOURCES+= datasize 44UNLIMIT_RESOURCES+= datasize
43UNLIMIT_RESOURCES+= stacksize 45UNLIMIT_RESOURCES+= stacksize
44 46
45SUBST_CLASSES+= vars 47SUBST_CLASSES+= vars
46SUBST_STAGE.vars= pre-configure 48SUBST_STAGE.vars= pre-configure
47SUBST_FILES.vars= gcc/Makefile.in 49SUBST_FILES.vars= gcc/Makefile.in
48SUBST_VARS.vars= GCC_TARGET_MACHINE 50SUBST_VARS.vars= GCC_TARGET_MACHINE
49 51
50.include "../../mk/bsd.prefs.mk" 52.include "../../mk/bsd.prefs.mk"
51 53
52LANGS= c 54LANGS= c
53 55
54# In some cases LINKER_RPATH_FLAG needs a trailing space. 56# In some cases LINKER_RPATH_FLAG needs a trailing space.
55LINKER_RPATH_FLAG:= ${LINKER_RPATH_FLAG:S/-rpath/& /} 57LINKER_RPATH_FLAG:= ${LINKER_RPATH_FLAG:S/-rpath/& /}
56 58
57## The Library rpath to use in end programs. 59## The Library rpath to use in end programs.
58LDFLAGS_FOR_TARGET= ${LDFLAGS:M${COMPILER_RPATH_FLAG}*:N*/usr/lib*} 60LDFLAGS_FOR_TARGET= ${LDFLAGS:M${COMPILER_RPATH_FLAG}*:N*/usr/lib*}
59 61
60# The "-static-libstdc++ -static-libgcc" flags are normally added to the 62# The "-static-libstdc++ -static-libgcc" flags are normally added to the
61# boot-ldflags by configure but because we are supply the boot-ldflags 63# boot-ldflags by configure but because we are supply the boot-ldflags
62# we mash supply them. 64# we mash supply them.
63BOOT_LDFLAGS= -static-libstdc++ -static-libgcc ${LDFLAGS_FOR_TARGET} 65BOOT_LDFLAGS= -static-libstdc++ -static-libgcc ${LDFLAGS_FOR_TARGET}
64# Needed on Darwin when LDFLAGS point to a SDK 66# Needed on Darwin when LDFLAGS point to a SDK
65BOOT_LDFLAGS+= ${LDFLAGS:M-Wl,-syslibroot*} 67BOOT_LDFLAGS+= ${LDFLAGS:M-Wl,-syslibroot*}
66 68
67# Ignore missing rpaths in "fake" library. 69# Ignore missing rpaths in "fake" library.
68CHECK_SHLIBS_SKIP+= ${GCC_PKGNAME}/lib*/libgcj_bc.so* 70CHECK_SHLIBS_SKIP+= ${GCC_PKGNAME}/lib*/libgcj_bc.so*
69 71
70## For target librarys and libjava programs. 72## For target librarys and libjava programs.
71CONFIGURE_ENV+= LDFLAGS_FOR_TARGET=${LDFLAGS_FOR_TARGET:Q} 73CONFIGURE_ENV+= LDFLAGS_FOR_TARGET=${LDFLAGS_FOR_TARGET:Q}
72 74
73.if !empty(MACHINE_PLATFORM:MNetBSD-*-*) # use the native SSP code in netbsd libc, gcc libssp conflicts with it. 75.if !empty(MACHINE_PLATFORM:MNetBSD-*-*) # use the native SSP code in netbsd libc, gcc libssp conflicts with it.
74CONFIGURE_ARGS+= --disable-libssp 76CONFIGURE_ARGS+= --disable-libssp
75.else 77.else
76CONFIGURE_ARGS+= --enable-libssp 78CONFIGURE_ARGS+= --enable-libssp
77.endif 79.endif
78 80
79CONFIGURE_ARGS+= --enable-languages=${LANGS:Q} 81CONFIGURE_ARGS+= --enable-languages=${LANGS:Q}
80CONFIGURE_ARGS+= --enable-shared 82CONFIGURE_ARGS+= --enable-shared
81CONFIGURE_ARGS+= --enable-long-long 83CONFIGURE_ARGS+= --enable-long-long
82CONFIGURE_ARGS+= --with-local-prefix=${GCC_PREFIX:Q} 84CONFIGURE_ARGS+= --with-local-prefix=${GCC_PREFIX:Q}
83CONFIGURE_ARGS+= --enable-threads=posix 85CONFIGURE_ARGS+= --enable-threads=posix
84CONFIGURE_ARGS+= --with-boot-ldflags=${BOOT_LDFLAGS:Q} 86CONFIGURE_ARGS+= --with-boot-ldflags=${BOOT_LDFLAGS:Q}
85 87
86CONFIGURE_ARGS.NetBSD+= --with-gnu-ld --with-ld=/usr/bin/ld 88CONFIGURE_ARGS.NetBSD+= --with-gnu-ld --with-ld=/usr/bin/ld
87CONFIGURE_ARGS.NetBSD+= --with-gnu-as --with-as=/usr/bin/as 89CONFIGURE_ARGS.NetBSD+= --with-gnu-as --with-as=/usr/bin/as
88MAKE_ENV.NetBSD+= ac_cv_func_clock_gettime=yes 90MAKE_ENV.NetBSD+= ac_cv_func_clock_gettime=yes
89MAKE_ENV.NetBSD+= ac_cv_func_gethostbyname_r=no 91MAKE_ENV.NetBSD+= ac_cv_func_gethostbyname_r=no
90 92
91CONFIGURE_ARGS.DragonFly+= --disable-bootstrap 93CONFIGURE_ARGS.DragonFly+= --disable-bootstrap
92 94
93# See ${WRKSRC}/libgcc/config/t-slibgcc-darwin: It uses strip(1) to 95# See ${WRKSRC}/libgcc/config/t-slibgcc-darwin: It uses strip(1) to
94# create a stub library, not just to remove symbols, so we must not 96# create a stub library, not just to remove symbols, so we must not
95# let strip(1) be a no-op regardless of ${INSTALL_UNSTRIPPED} or the 97# let strip(1) be a no-op regardless of ${INSTALL_UNSTRIPPED} or the
96# build fails for missing files. 98# build fails for missing files.
97CONFIGURE_ARGS.Darwin+= STRIP_FOR_TARGET=${TOOLS_PLATFORM.strip} 99CONFIGURE_ARGS.Darwin+= STRIP_FOR_TARGET=${TOOLS_PLATFORM.strip}
98 100
99.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*) 101.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
100CONFIGURE_ARGS+= --with-dwarf2 102CONFIGURE_ARGS+= --with-dwarf2
101CONFIGURE_ARGS+= --disable-libitm 103CONFIGURE_ARGS+= --disable-libitm
102.endif 104.endif
103 105
104.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-powerpc) 106.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-powerpc)
105CONFIGURE_ARGS+= --disable-multilib 107CONFIGURE_ARGS+= --disable-multilib
106.endif 108.endif
107 109
108.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || !empty(MACHINE_PLATFORM:MLinux-*-i386) 110.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || !empty(MACHINE_PLATFORM:MLinux-*-i386)
109CONFIGURE_ARGS+= --with-arch=i486 --with-tune=i486 111CONFIGURE_ARGS+= --with-arch=i486 --with-tune=i486
110.endif 112.endif
111 113
112# Disable fixincludes on SmartOS, header changes result in broken includes 114# Disable fixincludes on SmartOS, header changes result in broken includes
113# being generated, see https://github.com/joyent/pkgsrc/issues/270 115# being generated, see https://github.com/joyent/pkgsrc/issues/270
114.if ${OS_VARIANT} == "SmartOS" 116.if ${OS_VARIANT} == "SmartOS"
115SUBST_CLASSES+= fixinc 117SUBST_CLASSES+= fixinc
116SUBST_STAGE.fixinc= pre-configure 118SUBST_STAGE.fixinc= pre-configure
117SUBST_FILES.fixinc= gcc/Makefile.in 119SUBST_FILES.fixinc= gcc/Makefile.in
118SUBST_SED.fixinc= -e "s,\./fixinc.sh,-c true," 120SUBST_SED.fixinc= -e "s,\./fixinc.sh,-c true,"
119.endif 121.endif
120 122
121.include "options.mk" 123.include "options.mk"
122 124
123# ${WRKSRC}/fixincludes/ looks for sed and compiles the path to sed into 125# ${WRKSRC}/fixincludes/ looks for sed and compiles the path to sed into
124# a binary so we need to make sure we give it the installed sed and not 126# a binary so we need to make sure we give it the installed sed and not
125# the tool wrapped one. 127# the tool wrapped one.
126MAKE_ENV+= ac_cv_path_SED=${TOOLS_SED} 128MAKE_ENV+= ac_cv_path_SED=${TOOLS_SED}
127MAKE_ENV+= lt_cv_path_SED=${TOOLS_SED} 129MAKE_ENV+= lt_cv_path_SED=${TOOLS_SED}
128 130
129.if !empty(MACHINE_PLATFORM:MSunOS-5.1[123456789]-*) 131.if !empty(MACHINE_PLATFORM:MSunOS-5.1[123456789]-*)
130# Causes multilib build problems with specific compiler combinations 132# Causes multilib build problems with specific compiler combinations
131MAKE_ENV+= gcc_cv_ld_as_needed=no 133MAKE_ENV+= gcc_cv_ld_as_needed=no
132# Determine whether to use binutils 134# Determine whether to use binutils
133. if exists(/usr/sfw/bin/gobjdump) 135. if exists(/usr/sfw/bin/gobjdump)
134CONFIGURE_ENV+= OBJDUMP=/usr/sfw/bin/gobjdump 136CONFIGURE_ENV+= OBJDUMP=/usr/sfw/bin/gobjdump
135. endif 137. endif
136. if exists(/usr/bin/ld) 138. if exists(/usr/bin/ld)
137CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/bin/ld 139CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/bin/ld
138. else 140. else
139CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/ccs/bin/ld 141CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/ccs/bin/ld
140. endif 142. endif
141. if exists(/usr/sfw/bin/gas) 143. if exists(/usr/sfw/bin/gas)
142CONFIGURE_ARGS+= --with-gnu-as --with-as=/usr/sfw/bin/gas 144CONFIGURE_ARGS+= --with-gnu-as --with-as=/usr/sfw/bin/gas
143. elif exists(/usr/ccs/bin/as) 145. elif exists(/usr/ccs/bin/as)
144CONFIGURE_ARGS+= --without-gnu-as --with-as=/usr/ccs/bin/as 146CONFIGURE_ARGS+= --without-gnu-as --with-as=/usr/ccs/bin/as
145. else 147. else
146BUILDLINK_DEPMETHOD.binutils= full 148BUILDLINK_DEPMETHOD.binutils= full
147. include "../../devel/binutils/buildlink3.mk" 149. include "../../devel/binutils/buildlink3.mk"
148CONFIGURE_ARGS+= --with-gnu-as --with-as=${PREFIX}/bin/gas 150CONFIGURE_ARGS+= --with-gnu-as --with-as=${PREFIX}/bin/gas
149. endif 151. endif
150.elif !empty(MACHINE_PLATFORM:MSunOS-5.10-*) 152.elif !empty(MACHINE_PLATFORM:MSunOS-5.10-*)
151. if exists(/usr/sfw/bin/gobjdump) 153. if exists(/usr/sfw/bin/gobjdump)
152CONFIGURE_ENV+= OBJDUMP=/usr/sfw/bin/gobjdump 154CONFIGURE_ENV+= OBJDUMP=/usr/sfw/bin/gobjdump
153. endif 155. endif
154BUILDLINK_API_DEPENDS.binutils+= binutils>=2.23 156BUILDLINK_API_DEPENDS.binutils+= binutils>=2.23
155BUILDLINK_DEPMETHOD.binutils= full 157BUILDLINK_DEPMETHOD.binutils= full
156. include "../../devel/binutils/buildlink3.mk" 158. include "../../devel/binutils/buildlink3.mk"
157CONFIGURE_ENV+= OBJCOPY=${PREFIX}/bin/gobjcopy 159CONFIGURE_ENV+= OBJCOPY=${PREFIX}/bin/gobjcopy
158CONFIGURE_ARGS+= --with-gnu-as --with-as=${PREFIX}/bin/gas 160CONFIGURE_ARGS+= --with-gnu-as --with-as=${PREFIX}/bin/gas
159CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/ccs/bin/ld 161CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/ccs/bin/ld
160.endif 162.endif
161 163
162pre-configure: 164pre-configure:
163 ${RUN} cd ${WRKSRC} && ${MKDIR} ${OBJDIR} 165 ${RUN} cd ${WRKSRC} && ${MKDIR} ${OBJDIR}
164 166
165TEST_TARGET= -k check || ${TRUE} 167TEST_TARGET= -k check || ${TRUE}
166pre-test: 168pre-test:
167 ${RUN} \ 169 ${RUN} \
168 if runtest --version >/dev/null 2>/dev/null ; then \ 170 if runtest --version >/dev/null 2>/dev/null ; then \
169 : ; \ 171 : ; \
170 else \ 172 else \
171 ${ECHO} "ERROR: Please install devel/dejagnu in order to run the test suite." ; \ 173 ${ECHO} "ERROR: Please install devel/dejagnu in order to run the test suite." ; \
172 exit 1 ; \ 174 exit 1 ; \
173 fi 175 fi
174post-test: 176post-test:
175 ${RUN} cd ${WRKSRC} && cd ${OBJDIR} && \ 177 ${RUN} cd ${WRKSRC} && cd ${OBJDIR} && \
176 ${SHELL} ${WRKSRC}/contrib/test_summary >${WRKDIR}/test_summary.log 178 ${SHELL} ${WRKSRC}/contrib/test_summary >${WRKDIR}/test_summary.log
177 @${INFO_MSG} "Test summary are available in ${WRKDIR}/test_summary.log" 179 @${INFO_MSG} "Test summary are available in ${WRKDIR}/test_summary.log"
178 180
179post-install: 181post-install:
180 ${TEST} -f ${DESTDIR}${GCC_PREFIX}/bin/cc || \ 182 ${TEST} -f ${DESTDIR}${GCC_PREFIX}/bin/cc || \
181 ( cd ${DESTDIR}${GCC_PREFIX}/bin ; ${LN} -f gcc cc ) 183 ( cd ${DESTDIR}${GCC_PREFIX}/bin ; ${LN} -f gcc cc )
182.if !empty(PKG_OPTIONS:Mgcc-java) 184.if !empty(PKG_OPTIONS:Mgcc-java)
183 ${RM} -f ${DESTDIR}${JAVA_HOME}/bin/javadoc 185 ${RM} -f ${DESTDIR}${JAVA_HOME}/bin/javadoc
184 ${RM} -f ${DESTDIR}${JAVA_HOME}/jre/lib/${JAVA_ARCH}/libjawt.so 186 ${RM} -f ${DESTDIR}${JAVA_HOME}/jre/lib/${JAVA_ARCH}/libjawt.so
185.endif 187.endif
186.if !empty(MACHINE_PLATFORM:MSunOS-*-*86*) && ${OS_VERSION} != "5.11" 188.if !empty(MACHINE_PLATFORM:MSunOS-*-*86*) && ${OS_VERSION} != "5.11"
187 ${SH} files/values.c ${DESTDIR}${GCC_PREFIX}/bin/gcc -m32 || ${TRUE} 189 ${SH} files/values.c ${DESTDIR}${GCC_PREFIX}/bin/gcc -m32 || ${TRUE}
188 ${SH} files/values.c ${DESTDIR}${GCC_PREFIX}/bin/gcc -m64 || ${TRUE} 190 ${SH} files/values.c ${DESTDIR}${GCC_PREFIX}/bin/gcc -m64 || ${TRUE}
189.endif 191.endif
190 192
191GENERATE_PLIST+= \ 193GENERATE_PLIST+= \
192 cd ${DESTDIR}${PREFIX} && \ 194 cd ${DESTDIR}${PREFIX} && \
193 ${FIND} ${GCC_SUBPREFIX} \( -type f -o -type l \) -print | ${SORT} ; 195 ${FIND} ${GCC_SUBPREFIX} \( -type f -o -type l \) -print | ${SORT} ;
194 196
195.include "../../mk/dlopen.buildlink3.mk" 197.include "../../mk/dlopen.buildlink3.mk"
196.include "../../mk/pthread.buildlink3.mk" 198.include "../../mk/pthread.buildlink3.mk"
197.include "../../mk/bsd.pkg.mk" 199.include "../../mk/bsd.pkg.mk"

cvs diff -r1.18 -r1.19 pkgsrc/lang/gcc5/Attic/Makefile (switch to unified diff)

--- pkgsrc/lang/gcc5/Attic/Makefile 2017/06/21 21:16:36 1.18
+++ pkgsrc/lang/gcc5/Attic/Makefile 2017/06/22 21:44:49 1.19
@@ -1,190 +1,191 @@ @@ -1,190 +1,191 @@
1# $NetBSD: Makefile,v 1.18 2017/06/21 21:16:36 maya Exp $ 1# $NetBSD: Makefile,v 1.19 2017/06/22 21:44:49 maya Exp $
2 2
3GCC_PKGNAME= gcc5 3GCC_PKGNAME= gcc5
4PKGREVISION= 3 4PKGREVISION= 3
5.include "version.mk" 5.include "version.mk"
6 6
7DISTNAME= gcc-${GCC5_DIST_VERSION} 7DISTNAME= gcc-${GCC5_DIST_VERSION}
8PKGNAME= ${GCC_PKGNAME}-${GCC5_DIST_VERSION} 8PKGNAME= ${GCC_PKGNAME}-${GCC5_DIST_VERSION}
9## When bumping the PKGREVISION of this package the PKGREVISION of 9## When bumping the PKGREVISION of this package the PKGREVISION of
10## lang/gcc5-libs needs to be bump to be at least 1 more than the 10## lang/gcc5-libs needs to be bump to be at least 1 more than the
11## PKGREVISION of this package! 11## PKGREVISION of this package!
12CATEGORIES= lang 12CATEGORIES= lang
13MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC5_DIST_VERSION}/} 13MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC5_DIST_VERSION}/}
14EXTRACT_SUFX= .tar.bz2 14EXTRACT_SUFX= .tar.bz2
15 15
16MAINTAINER= maya@NetBSD.org 16MAINTAINER= maya@NetBSD.org
17HOMEPAGE= http://gcc.gnu.org/ 17HOMEPAGE= http://gcc.gnu.org/
18COMMENT= The GNU Compiler Collection (GCC) - 5 Release Series 18COMMENT= The GNU Compiler Collection (GCC) - 5 Release Series
19LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3 19LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
20 20
21DISTFILES= ${DEFAULT_DISTFILES} 21DISTFILES= ${DEFAULT_DISTFILES}
22EXTRACT_ONLY= ${DEFAULT_DISTFILES} 22EXTRACT_ONLY= ${DEFAULT_DISTFILES}
23 23
24NOT_FOR_PLATFORM= Interix-*-* 24NOT_FOR_PLATFORM= Interix-*-*
25 25
26USE_LANGUAGES= c c++ 26USE_LANGUAGES= c c++
27USE_TOOLS+= gmake makeinfo gsed tar:build 27USE_TOOLS+= gmake makeinfo sed:run tar:build
 28USE_TOOLS.NetBSD+= gsed
28 29
29GNU_CONFIGURE= yes 30GNU_CONFIGURE= yes
30## Build outside ${WRKSRC} 31## Build outside ${WRKSRC}
31OBJDIR= ../build 32OBJDIR= ../build
32CONFIGURE_DIRS= ${OBJDIR} 33CONFIGURE_DIRS= ${OBJDIR}
33CONFIGURE_SCRIPT= ../${DISTNAME}/configure 34CONFIGURE_SCRIPT= ../${DISTNAME}/configure
34GCC_SUBPREFIX= ${GCC_PKGNAME} 35GCC_SUBPREFIX= ${GCC_PKGNAME}
35GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX} 36GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX}
36GNU_CONFIGURE_PREFIX= ${GCC_PREFIX} 37GNU_CONFIGURE_PREFIX= ${GCC_PREFIX}
37INFO_FILES= yes 38INFO_FILES= yes
38CONFIGURE_ARGS+= --disable-libstdcxx-pch 39CONFIGURE_ARGS+= --disable-libstdcxx-pch
39 40
40UNLIMIT_RESOURCES+= datasize 41UNLIMIT_RESOURCES+= datasize
41UNLIMIT_RESOURCES+= stacksize 42UNLIMIT_RESOURCES+= stacksize
42 43
43SUBST_CLASSES+= vars 44SUBST_CLASSES+= vars
44SUBST_MESSAGE.vars= Setting target machine name path in ${SUBST_FILES.vars} 45SUBST_MESSAGE.vars= Setting target machine name path in ${SUBST_FILES.vars}
45SUBST_STAGE.vars= pre-configure 46SUBST_STAGE.vars= pre-configure
46SUBST_FILES.vars= gcc/Makefile.in 47SUBST_FILES.vars= gcc/Makefile.in
47SUBST_VARS.vars= GCC_TARGET_MACHINE 48SUBST_VARS.vars= GCC_TARGET_MACHINE
48 49
49.include "../../mk/bsd.prefs.mk" 50.include "../../mk/bsd.prefs.mk"
50 51
51LANGS= c 52LANGS= c
52 53
53# In some cases LINKER_RPATH_FLAG needs a trailing space. 54# In some cases LINKER_RPATH_FLAG needs a trailing space.
54LINKER_RPATH_FLAG:= ${LINKER_RPATH_FLAG:S/-rpath/& /} 55LINKER_RPATH_FLAG:= ${LINKER_RPATH_FLAG:S/-rpath/& /}
55 56
56## The Library rpath to use in end programs. 57## The Library rpath to use in end programs.
57LDFLAGS_FOR_TARGET= ${LDFLAGS:M${COMPILER_RPATH_FLAG}*:N*/usr/lib*} 58LDFLAGS_FOR_TARGET= ${LDFLAGS:M${COMPILER_RPATH_FLAG}*:N*/usr/lib*}
58 59
59# The "-static-libstdc++ -static-libgcc" flags are normally added to the 60# The "-static-libstdc++ -static-libgcc" flags are normally added to the
60# boot-ldflags by configure but because we are supply the boot-ldflags 61# boot-ldflags by configure but because we are supply the boot-ldflags
61# we mash supply them. 62# we mash supply them.
62BOOT_LDFLAGS= -static-libstdc++ -static-libgcc ${LDFLAGS_FOR_TARGET} 63BOOT_LDFLAGS= -static-libstdc++ -static-libgcc ${LDFLAGS_FOR_TARGET}
63# Needed on Darwin when LDFLAGS point to a SDK 64# Needed on Darwin when LDFLAGS point to a SDK
64BOOT_LDFLAGS+= ${LDFLAGS:M-Wl,-syslibroot*} 65BOOT_LDFLAGS+= ${LDFLAGS:M-Wl,-syslibroot*}
65# GCC does not understand this option; remove it, or stage build will fail 66# GCC does not understand this option; remove it, or stage build will fail
66BUILDLINK_TRANSFORM+= rm:-stdlib=libc++ 67BUILDLINK_TRANSFORM+= rm:-stdlib=libc++
67 68
68.include "options.mk" 69.include "options.mk"
69 70
70## For graphite support. 71## For graphite support.
71.if !empty(PKG_OPTIONS:Mgcc-graphite) 72.if !empty(PKG_OPTIONS:Mgcc-graphite)
72 73
73post-extract: 74post-extract:
74 ${TAR} -jxf ${DISTDIR}/${ISL14}.tar.bz2 -C ${WRKSRC} 75 ${TAR} -jxf ${DISTDIR}/${ISL14}.tar.bz2 -C ${WRKSRC}
75 ${MV} ${WRKSRC}/${ISL14} ${WRKSRC}/isl 76 ${MV} ${WRKSRC}/${ISL14} ${WRKSRC}/isl
76.endif 77.endif
77 78
78## For target librarys and libjava programs. 79## For target librarys and libjava programs.
79CONFIGURE_ENV+= LDFLAGS_FOR_TARGET=${LDFLAGS_FOR_TARGET:Q} 80CONFIGURE_ENV+= LDFLAGS_FOR_TARGET=${LDFLAGS_FOR_TARGET:Q}
80 81
81CONFIGURE_ARGS+= --enable-languages=${LANGS:Q} 82CONFIGURE_ARGS+= --enable-languages=${LANGS:Q}
82CONFIGURE_ARGS+= --enable-shared 83CONFIGURE_ARGS+= --enable-shared
83CONFIGURE_ARGS+= --enable-long-long 84CONFIGURE_ARGS+= --enable-long-long
84CONFIGURE_ARGS+= --with-local-prefix=${GCC_PREFIX:Q} 85CONFIGURE_ARGS+= --with-local-prefix=${GCC_PREFIX:Q}
85.if !empty(MACHINE_PLATFORM:MNetBSD-*-*) 86.if !empty(MACHINE_PLATFORM:MNetBSD-*-*)
86# on NetBSD, use the native SSP code in libc 87# on NetBSD, use the native SSP code in libc
87CONFIGURE_ARGS+= --disable-libssp 88CONFIGURE_ARGS+= --disable-libssp
88.else 89.else
89CONFIGURE_ARGS+= --enable-libssp 90CONFIGURE_ARGS+= --enable-libssp
90.endif 91.endif
91CONFIGURE_ARGS+= --enable-threads=posix 92CONFIGURE_ARGS+= --enable-threads=posix
92CONFIGURE_ARGS+= --with-boot-ldflags=${BOOT_LDFLAGS:Q} 93CONFIGURE_ARGS+= --with-boot-ldflags=${BOOT_LDFLAGS:Q}
93 94
94# multilib on Darwin requires fat-binaries 95# multilib on Darwin requires fat-binaries
95CONFIGURE_ARGS.Darwin+= --disable-multilib 96CONFIGURE_ARGS.Darwin+= --disable-multilib
96.if !empty(OSX_SDK_PATH) 97.if !empty(OSX_SDK_PATH)
97CONFIGURE_ARGS.Darwin+= --with-sysroot=${OSX_SDK_PATH} 98CONFIGURE_ARGS.Darwin+= --with-sysroot=${OSX_SDK_PATH}
98.endif 99.endif
99CONFIGURE_ARGS.NetBSD+= --with-gnu-ld --with-ld=/usr/bin/ld 100CONFIGURE_ARGS.NetBSD+= --with-gnu-ld --with-ld=/usr/bin/ld
100CONFIGURE_ARGS.NetBSD+= --with-gnu-as --with-as=/usr/bin/as 101CONFIGURE_ARGS.NetBSD+= --with-gnu-as --with-as=/usr/bin/as
101MAKE_ENV.NetBSD+= ac_cv_func_clock_gettime=yes 102MAKE_ENV.NetBSD+= ac_cv_func_clock_gettime=yes
102MAKE_ENV.NetBSD+= ac_cv_func_gethostbyname_r=no 103MAKE_ENV.NetBSD+= ac_cv_func_gethostbyname_r=no
103MAKE_ENV.NetBSD+= ac_cv_func_freelocale=no 104MAKE_ENV.NetBSD+= ac_cv_func_freelocale=no
104MAKE_ENV.NetBSD+= ac_cv_func_newlocale=no 105MAKE_ENV.NetBSD+= ac_cv_func_newlocale=no
105MAKE_ENV.NetBSD+= ac_cv_func_uselocale=no 106MAKE_ENV.NetBSD+= ac_cv_func_uselocale=no
106 107
107CONFIGURE_ARGS.DragonFly+= --disable-bootstrap 108CONFIGURE_ARGS.DragonFly+= --disable-bootstrap
108 109
109.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || !empty(MACHINE_PLATFORM:MLinux-*-i386) 110.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || !empty(MACHINE_PLATFORM:MLinux-*-i386)
110CONFIGURE_ARGS+= --with-arch=i486 --with-tune=i486 111CONFIGURE_ARGS+= --with-arch=i486 --with-tune=i486
111.endif 112.endif
112 113
113.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || !empty(MACHINE_PLATFORM:MLinux-*-x86_64) 114.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || !empty(MACHINE_PLATFORM:MLinux-*-x86_64)
114CONFIGURE_ARGS+= --with-arch=nocona --with-tune=nocona --with-fpmath=sse 115CONFIGURE_ARGS+= --with-arch=nocona --with-tune=nocona --with-fpmath=sse
115.endif 116.endif
116 117
117.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*) 118.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
118CONFIGURE_ARGS+= --with-dwarf2 119CONFIGURE_ARGS+= --with-dwarf2
119.endif 120.endif
120 121
121# ${WRKSRC}/fixincludes/ looks for sed and compiles the path to sed into 122# ${WRKSRC}/fixincludes/ looks for sed and compiles the path to sed into
122# a binary so we need to make sure we give it the installed sed and not 123# a binary so we need to make sure we give it the installed sed and not
123# the tool wrapped one. 124# the tool wrapped one.
124MAKE_ENV+= ac_cv_path_SED=${TOOLS_SED} 125MAKE_ENV+= ac_cv_path_SED=${TOOLS_SED}
125MAKE_ENV+= lt_cv_path_SED=${TOOLS_SED} 126MAKE_ENV+= lt_cv_path_SED=${TOOLS_SED}
126 127
127# Determine whether to use binutils 128# Determine whether to use binutils
128.if ${OPSYS} == "SunOS" 129.if ${OPSYS} == "SunOS"
129. if exists(/usr/sfw/bin/gobjdump) 130. if exists(/usr/sfw/bin/gobjdump)
130CONFIGURE_ENV+= OBJDUMP=/usr/sfw/bin/gobjdump 131CONFIGURE_ENV+= OBJDUMP=/usr/sfw/bin/gobjdump
131. endif 132. endif
132. if exists(/usr/bin/ld) 133. if exists(/usr/bin/ld)
133CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/bin/ld 134CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/bin/ld
134. else 135. else
135CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/ccs/bin/ld 136CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/ccs/bin/ld
136. endif 137. endif
137. if exists(/usr/sfw/bin/gas) 138. if exists(/usr/sfw/bin/gas)
138CONFIGURE_ARGS+= --with-gnu-as --with-as=/usr/sfw/bin/gas 139CONFIGURE_ARGS+= --with-gnu-as --with-as=/usr/sfw/bin/gas
139. elif exists(/usr/ccs/bin/as) 140. elif exists(/usr/ccs/bin/as)
140CONFIGURE_ARGS+= --without-gnu-as --with-as=/usr/ccs/bin/as 141CONFIGURE_ARGS+= --without-gnu-as --with-as=/usr/ccs/bin/as
141. else 142. else
142BUILDLINK_DEPMETHOD.binutils= full 143BUILDLINK_DEPMETHOD.binutils= full
143. include "../../devel/binutils/buildlink3.mk" 144. include "../../devel/binutils/buildlink3.mk"
144CONFIGURE_ARGS+= --with-gnu-as --with-as=${PREFIX}/bin/gas 145CONFIGURE_ARGS+= --with-gnu-as --with-as=${PREFIX}/bin/gas
145. endif 146. endif
146.endif 147.endif
147 148
148.if ${OS_VARIANT} == "SmartOS" 149.if ${OS_VARIANT} == "SmartOS"
149SUBST_CLASSES+= ccs 150SUBST_CLASSES+= ccs
150SUBST_STAGE.ccs= pre-configure 151SUBST_STAGE.ccs= pre-configure
151SUBST_FILES.ccs= contrib/make_sunver.pl 152SUBST_FILES.ccs= contrib/make_sunver.pl
152SUBST_SED.ccs= -e 's,/usr/ccs/bin,/usr/bin,g' 153SUBST_SED.ccs= -e 's,/usr/ccs/bin,/usr/bin,g'
153.endif 154.endif
154 155
155pre-configure: 156pre-configure:
156 ${RUN} cd ${WRKSRC} && ${MKDIR} ${OBJDIR} 157 ${RUN} cd ${WRKSRC} && ${MKDIR} ${OBJDIR}
157 158
158TEST_TARGET= -k check || ${TRUE} 159TEST_TARGET= -k check || ${TRUE}
159pre-test: 160pre-test:
160 ${RUN} \ 161 ${RUN} \
161 if runtest --version >/dev/null 2>/dev/null ; then \ 162 if runtest --version >/dev/null 2>/dev/null ; then \
162 : ; \ 163 : ; \
163 else \ 164 else \
164 ${ECHO} "ERROR: Please install devel/dejagnu in order to run the test suite." ; \ 165 ${ECHO} "ERROR: Please install devel/dejagnu in order to run the test suite." ; \
165 exit 1 ; \ 166 exit 1 ; \
166 fi 167 fi
167post-test: 168post-test:
168 ${RUN} cd ${WRKSRC} && cd ${OBJDIR} && \ 169 ${RUN} cd ${WRKSRC} && cd ${OBJDIR} && \
169 ${SHELL} ${WRKSRC}/contrib/test_summary >${WRKDIR}/test_summary.log 170 ${SHELL} ${WRKSRC}/contrib/test_summary >${WRKDIR}/test_summary.log
170 ${INFO_MSG} "Test summary are available in ${WRKDIR}/test_summary.log" 171 ${INFO_MSG} "Test summary are available in ${WRKDIR}/test_summary.log"
171 172
172post-install: 173post-install:
173 ${TEST} -f ${DESTDIR}${GCC_PREFIX}/bin/cc || \ 174 ${TEST} -f ${DESTDIR}${GCC_PREFIX}/bin/cc || \
174 ( cd ${DESTDIR}${GCC_PREFIX}/bin ; ${LN} -f gcc cc ) 175 ( cd ${DESTDIR}${GCC_PREFIX}/bin ; ${LN} -f gcc cc )
175.if !empty(PKG_OPTIONS:Mgcc-java) 176.if !empty(PKG_OPTIONS:Mgcc-java)
176 ${RM} -f ${DESTDIR}${JAVA_HOME}/bin/javadoc 177 ${RM} -f ${DESTDIR}${JAVA_HOME}/bin/javadoc
177 ${RM} -f ${DESTDIR}${JAVA_HOME}/jre/lib/${JAVA_ARCH}/libjawt.so 178 ${RM} -f ${DESTDIR}${JAVA_HOME}/jre/lib/${JAVA_ARCH}/libjawt.so
178.endif 179.endif
179.if !empty(MACHINE_PLATFORM:MSunOS-*-*86*) && ${OS_VERSION} != "5.11" 180.if !empty(MACHINE_PLATFORM:MSunOS-*-*86*) && ${OS_VERSION} != "5.11"
180 ${SH} files/values.c ${DESTDIR}${GCC_PREFIX}/bin/gcc -m32 || ${TRUE} 181 ${SH} files/values.c ${DESTDIR}${GCC_PREFIX}/bin/gcc -m32 || ${TRUE}
181 ${SH} files/values.c ${DESTDIR}${GCC_PREFIX}/bin/gcc -m64 || ${TRUE} 182 ${SH} files/values.c ${DESTDIR}${GCC_PREFIX}/bin/gcc -m64 || ${TRUE}
182.endif 183.endif
183 184
184GENERATE_PLIST+= \ 185GENERATE_PLIST+= \
185 cd ${DESTDIR}${PREFIX} && \ 186 cd ${DESTDIR}${PREFIX} && \
186 ${FIND} ${GCC_SUBPREFIX} \( -type f -o -type l \) -print | ${SORT} ; 187 ${FIND} ${GCC_SUBPREFIX} \( -type f -o -type l \) -print | ${SORT} ;
187 188
188.include "../../mk/dlopen.buildlink3.mk" 189.include "../../mk/dlopen.buildlink3.mk"
189.include "../../mk/pthread.buildlink3.mk" 190.include "../../mk/pthread.buildlink3.mk"
190.include "../../mk/bsd.pkg.mk" 191.include "../../mk/bsd.pkg.mk"

cvs diff -r1.5 -r1.6 pkgsrc/lang/gcc6/Makefile (switch to unified diff)

--- pkgsrc/lang/gcc6/Makefile 2017/06/21 21:16:36 1.5
+++ pkgsrc/lang/gcc6/Makefile 2017/06/22 21:44:49 1.6
@@ -1,190 +1,191 @@ @@ -1,190 +1,191 @@
1# $NetBSD: Makefile,v 1.5 2017/06/21 21:16:36 maya Exp $ 1# $NetBSD: Makefile,v 1.6 2017/06/22 21:44:49 maya Exp $
2 2
3GCC_PKGNAME= gcc6 3GCC_PKGNAME= gcc6
4.include "version.mk" 4.include "version.mk"
5 5
6DISTNAME= gcc-${GCC6_DIST_VERSION} 6DISTNAME= gcc-${GCC6_DIST_VERSION}
7PKGNAME= ${GCC_PKGNAME}-${GCC6_DIST_VERSION} 7PKGNAME= ${GCC_PKGNAME}-${GCC6_DIST_VERSION}
8## When bumping the PKGREVISION of this package the PKGREVISION of 8## When bumping the PKGREVISION of this package the PKGREVISION of
9## lang/gcc6-libs needs to be bump to be at least 1 more than the 9## lang/gcc6-libs needs to be bump to be at least 1 more than the
10## PKGREVISION of this package! 10## PKGREVISION of this package!
11PKGREVISION= 1 11PKGREVISION= 1
12CATEGORIES= lang 12CATEGORIES= lang
13MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC6_DIST_VERSION}/} 13MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC6_DIST_VERSION}/}
14EXTRACT_SUFX= .tar.bz2 14EXTRACT_SUFX= .tar.bz2
15 15
16MAINTAINER= maya@NetBSD.org 16MAINTAINER= maya@NetBSD.org
17HOMEPAGE= http://gcc.gnu.org/ 17HOMEPAGE= http://gcc.gnu.org/
18COMMENT= The GNU Compiler Collection (GCC) - 6 Release Series 18COMMENT= The GNU Compiler Collection (GCC) - 6 Release Series
19LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3 19LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
20 20
21DISTFILES= ${DEFAULT_DISTFILES} 21DISTFILES= ${DEFAULT_DISTFILES}
22EXTRACT_ONLY= ${DEFAULT_DISTFILES} 22EXTRACT_ONLY= ${DEFAULT_DISTFILES}
23 23
24NOT_FOR_PLATFORM= Interix-*-* 24NOT_FOR_PLATFORM= Interix-*-*
25 25
26USE_LANGUAGES= c c++ 26USE_LANGUAGES= c c++
27USE_TOOLS+= gmake makeinfo gsed tar:build 27USE_TOOLS+= gmake makeinfo sed:run tar:build
 28USE_TOOLS.NetBSD+= gsed
28 29
29GNU_CONFIGURE= yes 30GNU_CONFIGURE= yes
30## Build outside ${WRKSRC} 31## Build outside ${WRKSRC}
31OBJDIR= ../build 32OBJDIR= ../build
32CONFIGURE_DIRS= ${OBJDIR} 33CONFIGURE_DIRS= ${OBJDIR}
33CONFIGURE_SCRIPT= ../${DISTNAME}/configure 34CONFIGURE_SCRIPT= ../${DISTNAME}/configure
34GCC_SUBPREFIX= ${GCC_PKGNAME} 35GCC_SUBPREFIX= ${GCC_PKGNAME}
35GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX} 36GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX}
36GNU_CONFIGURE_PREFIX= ${GCC_PREFIX} 37GNU_CONFIGURE_PREFIX= ${GCC_PREFIX}
37INFO_FILES= yes 38INFO_FILES= yes
38CONFIGURE_ARGS+= --disable-libstdcxx-pch 39CONFIGURE_ARGS+= --disable-libstdcxx-pch
39 40
40UNLIMIT_RESOURCES+= datasize 41UNLIMIT_RESOURCES+= datasize
41UNLIMIT_RESOURCES+= stacksize 42UNLIMIT_RESOURCES+= stacksize
42 43
43SUBST_CLASSES+= vars 44SUBST_CLASSES+= vars
44SUBST_MESSAGE.vars= Setting target machine name path in ${SUBST_FILES.vars} 45SUBST_MESSAGE.vars= Setting target machine name path in ${SUBST_FILES.vars}
45SUBST_STAGE.vars= pre-configure 46SUBST_STAGE.vars= pre-configure
46SUBST_FILES.vars= gcc/Makefile.in 47SUBST_FILES.vars= gcc/Makefile.in
47SUBST_VARS.vars= GCC_TARGET_MACHINE 48SUBST_VARS.vars= GCC_TARGET_MACHINE
48 49
49.include "../../mk/bsd.prefs.mk" 50.include "../../mk/bsd.prefs.mk"
50 51
51LANGS= c 52LANGS= c
52 53
53# In some cases LINKER_RPATH_FLAG needs a trailing space. 54# In some cases LINKER_RPATH_FLAG needs a trailing space.
54LINKER_RPATH_FLAG:= ${LINKER_RPATH_FLAG:S/-rpath/& /} 55LINKER_RPATH_FLAG:= ${LINKER_RPATH_FLAG:S/-rpath/& /}
55 56
56## The Library rpath to use in end programs. 57## The Library rpath to use in end programs.
57LDFLAGS_FOR_TARGET= ${LDFLAGS:M${COMPILER_RPATH_FLAG}*:N*/usr/lib*} 58LDFLAGS_FOR_TARGET= ${LDFLAGS:M${COMPILER_RPATH_FLAG}*:N*/usr/lib*}
58 59
59# The "-static-libstdc++ -static-libgcc" flags are normally added to the 60# The "-static-libstdc++ -static-libgcc" flags are normally added to the
60# boot-ldflags by configure but because we are supply the boot-ldflags 61# boot-ldflags by configure but because we are supply the boot-ldflags
61# we mash supply them. 62# we mash supply them.
62BOOT_LDFLAGS= -static-libstdc++ -static-libgcc ${LDFLAGS_FOR_TARGET} 63BOOT_LDFLAGS= -static-libstdc++ -static-libgcc ${LDFLAGS_FOR_TARGET}
63# Needed on Darwin when LDFLAGS point to a SDK 64# Needed on Darwin when LDFLAGS point to a SDK
64BOOT_LDFLAGS+= ${LDFLAGS:M-Wl,-syslibroot*} 65BOOT_LDFLAGS+= ${LDFLAGS:M-Wl,-syslibroot*}
65# GCC does not understand this option; remove it, or stage build will fail 66# GCC does not understand this option; remove it, or stage build will fail
66BUILDLINK_TRANSFORM+= rm:-stdlib=libc++ 67BUILDLINK_TRANSFORM+= rm:-stdlib=libc++
67 68
68.include "options.mk" 69.include "options.mk"
69 70
70## For graphite support. 71## For graphite support.
71.if !empty(PKG_OPTIONS:Mgcc-graphite) 72.if !empty(PKG_OPTIONS:Mgcc-graphite)
72 73
73post-extract: 74post-extract:
74 ${TAR} -jxf ${DISTDIR}/${ISL14}.tar.bz2 -C ${WRKSRC} 75 ${TAR} -jxf ${DISTDIR}/${ISL14}.tar.bz2 -C ${WRKSRC}
75 ${MV} ${WRKSRC}/${ISL14} ${WRKSRC}/isl 76 ${MV} ${WRKSRC}/${ISL14} ${WRKSRC}/isl
76.endif 77.endif
77 78
78## For target librarys and libjava programs. 79## For target librarys and libjava programs.
79CONFIGURE_ENV+= LDFLAGS_FOR_TARGET=${LDFLAGS_FOR_TARGET:Q} 80CONFIGURE_ENV+= LDFLAGS_FOR_TARGET=${LDFLAGS_FOR_TARGET:Q}
80 81
81CONFIGURE_ARGS+= --enable-languages=${LANGS:Q} 82CONFIGURE_ARGS+= --enable-languages=${LANGS:Q}
82CONFIGURE_ARGS+= --enable-shared 83CONFIGURE_ARGS+= --enable-shared
83CONFIGURE_ARGS+= --enable-long-long 84CONFIGURE_ARGS+= --enable-long-long
84CONFIGURE_ARGS+= --with-local-prefix=${GCC_PREFIX:Q} 85CONFIGURE_ARGS+= --with-local-prefix=${GCC_PREFIX:Q}
85.if !empty(MACHINE_PLATFORM:MNetBSD-*-*) 86.if !empty(MACHINE_PLATFORM:MNetBSD-*-*)
86# on NetBSD, use the native SSP code in libc 87# on NetBSD, use the native SSP code in libc
87CONFIGURE_ARGS+= --disable-libssp 88CONFIGURE_ARGS+= --disable-libssp
88.else 89.else
89CONFIGURE_ARGS+= --enable-libssp 90CONFIGURE_ARGS+= --enable-libssp
90.endif 91.endif
91CONFIGURE_ARGS+= --enable-threads=posix 92CONFIGURE_ARGS+= --enable-threads=posix
92CONFIGURE_ARGS+= --with-boot-ldflags=${BOOT_LDFLAGS:Q} 93CONFIGURE_ARGS+= --with-boot-ldflags=${BOOT_LDFLAGS:Q}
93 94
94# multilib on Darwin requires fat-binaries 95# multilib on Darwin requires fat-binaries
95CONFIGURE_ARGS.Darwin+= --disable-multilib 96CONFIGURE_ARGS.Darwin+= --disable-multilib
96.if !empty(OSX_SDK_PATH) 97.if !empty(OSX_SDK_PATH)
97CONFIGURE_ARGS.Darwin+= --with-sysroot=${OSX_SDK_PATH} 98CONFIGURE_ARGS.Darwin+= --with-sysroot=${OSX_SDK_PATH}
98.endif 99.endif
99CONFIGURE_ARGS.NetBSD+= --with-gnu-ld --with-ld=/usr/bin/ld 100CONFIGURE_ARGS.NetBSD+= --with-gnu-ld --with-ld=/usr/bin/ld
100CONFIGURE_ARGS.NetBSD+= --with-gnu-as --with-as=/usr/bin/as 101CONFIGURE_ARGS.NetBSD+= --with-gnu-as --with-as=/usr/bin/as
101MAKE_ENV.NetBSD+= ac_cv_func_clock_gettime=yes 102MAKE_ENV.NetBSD+= ac_cv_func_clock_gettime=yes
102MAKE_ENV.NetBSD+= ac_cv_func_gethostbyname_r=no 103MAKE_ENV.NetBSD+= ac_cv_func_gethostbyname_r=no
103MAKE_ENV.NetBSD+= ac_cv_func_freelocale=no 104MAKE_ENV.NetBSD+= ac_cv_func_freelocale=no
104MAKE_ENV.NetBSD+= ac_cv_func_newlocale=no 105MAKE_ENV.NetBSD+= ac_cv_func_newlocale=no
105MAKE_ENV.NetBSD+= ac_cv_func_uselocale=no 106MAKE_ENV.NetBSD+= ac_cv_func_uselocale=no
106 107
107CONFIGURE_ARGS.DragonFly+= --disable-bootstrap 108CONFIGURE_ARGS.DragonFly+= --disable-bootstrap
108 109
109.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || !empty(MACHINE_PLATFORM:MLinux-*-i386) 110.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || !empty(MACHINE_PLATFORM:MLinux-*-i386)
110CONFIGURE_ARGS+= --with-arch=i486 --with-tune=i486 111CONFIGURE_ARGS+= --with-arch=i486 --with-tune=i486
111.endif 112.endif
112 113
113.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || !empty(MACHINE_PLATFORM:MLinux-*-x86_64) 114.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || !empty(MACHINE_PLATFORM:MLinux-*-x86_64)
114CONFIGURE_ARGS+= --with-arch=nocona --with-tune=nocona --with-fpmath=sse 115CONFIGURE_ARGS+= --with-arch=nocona --with-tune=nocona --with-fpmath=sse
115.endif 116.endif
116 117
117.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*) 118.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
118CONFIGURE_ARGS+= --with-dwarf2 119CONFIGURE_ARGS+= --with-dwarf2
119.endif 120.endif
120 121
121# ${WRKSRC}/fixincludes/ looks for sed and compiles the path to sed into 122# ${WRKSRC}/fixincludes/ looks for sed and compiles the path to sed into
122# a binary so we need to make sure we give it the installed sed and not 123# a binary so we need to make sure we give it the installed sed and not
123# the tool wrapped one. 124# the tool wrapped one.
124MAKE_ENV+= ac_cv_path_SED=${TOOLS_SED} 125MAKE_ENV+= ac_cv_path_SED=${TOOLS_SED}
125MAKE_ENV+= lt_cv_path_SED=${TOOLS_SED} 126MAKE_ENV+= lt_cv_path_SED=${TOOLS_SED}
126 127
127# Determine whether to use binutils 128# Determine whether to use binutils
128.if ${OPSYS} == "SunOS" 129.if ${OPSYS} == "SunOS"
129. if exists(/usr/sfw/bin/gobjdump) 130. if exists(/usr/sfw/bin/gobjdump)
130CONFIGURE_ENV+= OBJDUMP=/usr/sfw/bin/gobjdump 131CONFIGURE_ENV+= OBJDUMP=/usr/sfw/bin/gobjdump
131. endif 132. endif
132. if exists(/usr/bin/ld) 133. if exists(/usr/bin/ld)
133CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/bin/ld 134CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/bin/ld
134. else 135. else
135CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/ccs/bin/ld 136CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/ccs/bin/ld
136. endif 137. endif
137. if exists(/usr/sfw/bin/gas) 138. if exists(/usr/sfw/bin/gas)
138CONFIGURE_ARGS+= --with-gnu-as --with-as=/usr/sfw/bin/gas 139CONFIGURE_ARGS+= --with-gnu-as --with-as=/usr/sfw/bin/gas
139. elif exists(/usr/ccs/bin/as) 140. elif exists(/usr/ccs/bin/as)
140CONFIGURE_ARGS+= --without-gnu-as --with-as=/usr/ccs/bin/as 141CONFIGURE_ARGS+= --without-gnu-as --with-as=/usr/ccs/bin/as
141. else 142. else
142BUILDLINK_DEPMETHOD.binutils= full 143BUILDLINK_DEPMETHOD.binutils= full
143. include "../../devel/binutils/buildlink3.mk" 144. include "../../devel/binutils/buildlink3.mk"
144CONFIGURE_ARGS+= --with-gnu-as --with-as=${PREFIX}/bin/gas 145CONFIGURE_ARGS+= --with-gnu-as --with-as=${PREFIX}/bin/gas
145. endif 146. endif
146.endif 147.endif
147 148
148.if ${OS_VARIANT} == "SmartOS" 149.if ${OS_VARIANT} == "SmartOS"
149SUBST_CLASSES+= ccs 150SUBST_CLASSES+= ccs
150SUBST_STAGE.ccs= pre-configure 151SUBST_STAGE.ccs= pre-configure
151SUBST_FILES.ccs= contrib/make_sunver.pl 152SUBST_FILES.ccs= contrib/make_sunver.pl
152SUBST_SED.ccs= -e 's,/usr/ccs/bin,/usr/bin,g' 153SUBST_SED.ccs= -e 's,/usr/ccs/bin,/usr/bin,g'
153.endif 154.endif
154 155
155pre-configure: 156pre-configure:
156 ${RUN} cd ${WRKSRC} && ${MKDIR} ${OBJDIR} 157 ${RUN} cd ${WRKSRC} && ${MKDIR} ${OBJDIR}
157 158
158TEST_TARGET= -k check || ${TRUE} 159TEST_TARGET= -k check || ${TRUE}
159pre-test: 160pre-test:
160 ${RUN} \ 161 ${RUN} \
161 if runtest --version >/dev/null 2>/dev/null ; then \ 162 if runtest --version >/dev/null 2>/dev/null ; then \
162 : ; \ 163 : ; \
163 else \ 164 else \
164 ${ECHO} "ERROR: Please install devel/dejagnu in order to run the test suite." ; \ 165 ${ECHO} "ERROR: Please install devel/dejagnu in order to run the test suite." ; \
165 exit 1 ; \ 166 exit 1 ; \
166 fi 167 fi
167post-test: 168post-test:
168 ${RUN} cd ${WRKSRC} && cd ${OBJDIR} && \ 169 ${RUN} cd ${WRKSRC} && cd ${OBJDIR} && \
169 ${SHELL} ${WRKSRC}/contrib/test_summary >${WRKDIR}/test_summary.log 170 ${SHELL} ${WRKSRC}/contrib/test_summary >${WRKDIR}/test_summary.log
170 ${INFO_MSG} "Test summary are available in ${WRKDIR}/test_summary.log" 171 ${INFO_MSG} "Test summary are available in ${WRKDIR}/test_summary.log"
171 172
172post-install: 173post-install:
173 ${TEST} -f ${DESTDIR}${GCC_PREFIX}/bin/cc || \ 174 ${TEST} -f ${DESTDIR}${GCC_PREFIX}/bin/cc || \
174 ( cd ${DESTDIR}${GCC_PREFIX}/bin ; ${LN} -f gcc cc ) 175 ( cd ${DESTDIR}${GCC_PREFIX}/bin ; ${LN} -f gcc cc )
175.if !empty(PKG_OPTIONS:Mgcc-java) 176.if !empty(PKG_OPTIONS:Mgcc-java)
176 ${RM} -f ${DESTDIR}${JAVA_HOME}/bin/javadoc 177 ${RM} -f ${DESTDIR}${JAVA_HOME}/bin/javadoc
177 ${RM} -f ${DESTDIR}${JAVA_HOME}/jre/lib/${JAVA_ARCH}/libjawt.so 178 ${RM} -f ${DESTDIR}${JAVA_HOME}/jre/lib/${JAVA_ARCH}/libjawt.so
178.endif 179.endif
179.if !empty(MACHINE_PLATFORM:MSunOS-*-*86*) && ${OS_VERSION} != "5.11" 180.if !empty(MACHINE_PLATFORM:MSunOS-*-*86*) && ${OS_VERSION} != "5.11"
180 ${SH} files/values.c ${DESTDIR}${GCC_PREFIX}/bin/gcc -m32 || ${TRUE} 181 ${SH} files/values.c ${DESTDIR}${GCC_PREFIX}/bin/gcc -m32 || ${TRUE}
181 ${SH} files/values.c ${DESTDIR}${GCC_PREFIX}/bin/gcc -m64 || ${TRUE} 182 ${SH} files/values.c ${DESTDIR}${GCC_PREFIX}/bin/gcc -m64 || ${TRUE}
182.endif 183.endif
183 184
184GENERATE_PLIST+= \ 185GENERATE_PLIST+= \
185 cd ${DESTDIR}${PREFIX} && \ 186 cd ${DESTDIR}${PREFIX} && \
186 ${FIND} ${GCC_SUBPREFIX} \( -type f -o -type l \) -print | ${SORT} ; 187 ${FIND} ${GCC_SUBPREFIX} \( -type f -o -type l \) -print | ${SORT} ;
187 188
188.include "../../mk/dlopen.buildlink3.mk" 189.include "../../mk/dlopen.buildlink3.mk"
189.include "../../mk/pthread.buildlink3.mk" 190.include "../../mk/pthread.buildlink3.mk"
190.include "../../mk/bsd.pkg.mk" 191.include "../../mk/bsd.pkg.mk"

cvs diff -r1.6 -r1.7 pkgsrc/lang/gcc7/Makefile (switch to unified diff)

--- pkgsrc/lang/gcc7/Makefile 2017/06/21 21:16:36 1.6
+++ pkgsrc/lang/gcc7/Makefile 2017/06/22 21:44:49 1.7
@@ -1,182 +1,183 @@ @@ -1,182 +1,183 @@
1# $NetBSD: Makefile,v 1.6 2017/06/21 21:16:36 maya Exp $ 1# $NetBSD: Makefile,v 1.7 2017/06/22 21:44:49 maya Exp $
2 2
3GCC_PKGNAME= gcc7 3GCC_PKGNAME= gcc7
4.include "version.mk" 4.include "version.mk"
5 5
6DISTNAME= gcc-${GCC7S_DIST_VERSION} 6DISTNAME= gcc-${GCC7S_DIST_VERSION}
7PKGNAME= ${GCC_PKGNAME}-${GCC7S_DIST_VERSION} 7PKGNAME= ${GCC_PKGNAME}-${GCC7S_DIST_VERSION}
8## When bumping the PKGREVISION of this package the PKGREVISION of 8## When bumping the PKGREVISION of this package the PKGREVISION of
9## lang/gcc7-libs needs to be bump to be at least 1 more than the 9## lang/gcc7-libs needs to be bump to be at least 1 more than the
10## PKGREVISION of this package! 10## PKGREVISION of this package!
11PKGREVISION= 3 11PKGREVISION= 3
12CATEGORIES= lang 12CATEGORIES= lang
13MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC7S_DIST_VERSION}/} 13MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC7S_DIST_VERSION}/}
14EXTRACT_SUFX= .tar.bz2 14EXTRACT_SUFX= .tar.bz2
15 15
16MAINTAINER= maya@NetBSD.org 16MAINTAINER= maya@NetBSD.org
17HOMEPAGE= http://gcc.gnu.org/ 17HOMEPAGE= http://gcc.gnu.org/
18COMMENT= The GNU Compiler Collection (GCC) - 7.0 Release Series 18COMMENT= The GNU Compiler Collection (GCC) - 7.0 Release Series
19LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3 19LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
20 20
21DISTFILES= ${DEFAULT_DISTFILES} 21DISTFILES= ${DEFAULT_DISTFILES}
22EXTRACT_ONLY= ${DEFAULT_DISTFILES} 22EXTRACT_ONLY= ${DEFAULT_DISTFILES}
23 23
24NOT_FOR_PLATFORM= Interix-*-* 24NOT_FOR_PLATFORM= Interix-*-*
25 25
26USE_LANGUAGES= c c++ 26USE_LANGUAGES= c c++
27USE_TOOLS+= gmake makeinfo gsed tar:build 27USE_TOOLS+= gmake makeinfo sed:run tar:build
 28USE_TOOLS.NetBSD+= gsed
28 29
29GNU_CONFIGURE= yes 30GNU_CONFIGURE= yes
30## Build outside ${WRKSRC} 31## Build outside ${WRKSRC}
31OBJDIR= ../build 32OBJDIR= ../build
32CONFIGURE_DIRS= ${OBJDIR} 33CONFIGURE_DIRS= ${OBJDIR}
33CONFIGURE_SCRIPT= ../${DISTNAME}/configure 34CONFIGURE_SCRIPT= ../${DISTNAME}/configure
34GCC_SUBPREFIX= ${GCC_PKGNAME} 35GCC_SUBPREFIX= ${GCC_PKGNAME}
35GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX} 36GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX}
36GNU_CONFIGURE_PREFIX= ${GCC_PREFIX} 37GNU_CONFIGURE_PREFIX= ${GCC_PREFIX}
37INFO_FILES= yes 38INFO_FILES= yes
38CONFIGURE_ARGS+= --disable-libstdcxx-pch 39CONFIGURE_ARGS+= --disable-libstdcxx-pch
39 40
40UNLIMIT_RESOURCES+= datasize 41UNLIMIT_RESOURCES+= datasize
41UNLIMIT_RESOURCES+= stacksize 42UNLIMIT_RESOURCES+= stacksize
42 43
43SUBST_CLASSES+= vars 44SUBST_CLASSES+= vars
44SUBST_MESSAGE.vars= Setting target machine name path in ${SUBST_FILES.vars} 45SUBST_MESSAGE.vars= Setting target machine name path in ${SUBST_FILES.vars}
45SUBST_STAGE.vars= pre-configure 46SUBST_STAGE.vars= pre-configure
46SUBST_FILES.vars= gcc/Makefile.in 47SUBST_FILES.vars= gcc/Makefile.in
47SUBST_VARS.vars= GCC_TARGET_MACHINE 48SUBST_VARS.vars= GCC_TARGET_MACHINE
48 49
49.include "../../mk/bsd.prefs.mk" 50.include "../../mk/bsd.prefs.mk"
50 51
51LANGS= c 52LANGS= c
52 53
53# In some cases LINKER_RPATH_FLAG needs a trailing space. 54# In some cases LINKER_RPATH_FLAG needs a trailing space.
54LINKER_RPATH_FLAG:= ${LINKER_RPATH_FLAG:S/-rpath/& /} 55LINKER_RPATH_FLAG:= ${LINKER_RPATH_FLAG:S/-rpath/& /}
55 56
56## The Library rpath to use in end programs. 57## The Library rpath to use in end programs.
57LDFLAGS_FOR_TARGET= ${LDFLAGS:M${COMPILER_RPATH_FLAG}*:N*/usr/lib*} 58LDFLAGS_FOR_TARGET= ${LDFLAGS:M${COMPILER_RPATH_FLAG}*:N*/usr/lib*}
58 59
59# The "-static-libstdc++ -static-libgcc" flags are normally added to the 60# The "-static-libstdc++ -static-libgcc" flags are normally added to the
60# boot-ldflags by configure but because we are supply the boot-ldflags 61# boot-ldflags by configure but because we are supply the boot-ldflags
61# we mash supply them. 62# we mash supply them.
62BOOT_LDFLAGS= -static-libstdc++ -static-libgcc ${LDFLAGS_FOR_TARGET} 63BOOT_LDFLAGS= -static-libstdc++ -static-libgcc ${LDFLAGS_FOR_TARGET}
63# Needed on Darwin when LDFLAGS point to a SDK 64# Needed on Darwin when LDFLAGS point to a SDK
64BOOT_LDFLAGS+= ${LDFLAGS:M-Wl,-syslibroot*} 65BOOT_LDFLAGS+= ${LDFLAGS:M-Wl,-syslibroot*}
65# GCC does not understand this option; remove it, or stage build will fail 66# GCC does not understand this option; remove it, or stage build will fail
66BUILDLINK_TRANSFORM+= rm:-stdlib=libc++ 67BUILDLINK_TRANSFORM+= rm:-stdlib=libc++
67 68
68.include "options.mk" 69.include "options.mk"
69 70
70## For graphite support. 71## For graphite support.
71.if !empty(PKG_OPTIONS:Mgcc-graphite) 72.if !empty(PKG_OPTIONS:Mgcc-graphite)
72 73
73post-extract: 74post-extract:
74 ${TAR} -jxf ${DISTDIR}/${ISL16}.tar.bz2 -C ${WRKSRC} 75 ${TAR} -jxf ${DISTDIR}/${ISL16}.tar.bz2 -C ${WRKSRC}
75 ${MV} ${WRKSRC}/${ISL16} ${WRKSRC}/isl 76 ${MV} ${WRKSRC}/${ISL16} ${WRKSRC}/isl
76.endif 77.endif
77 78
78.if !empty(MACHINE_PLATFORM:MNetBSD-*-*) 79.if !empty(MACHINE_PLATFORM:MNetBSD-*-*)
79# on NetBSD, use the native SSP code in libc 80# on NetBSD, use the native SSP code in libc
80CONFIGURE_ARGS+= --disable-libssp 81CONFIGURE_ARGS+= --disable-libssp
81.else 82.else
82CONFIGURE_ARGS+= --enable-libssp 83CONFIGURE_ARGS+= --enable-libssp
83.endif 84.endif
84 85
85## For target librarys and libjava programs. 86## For target librarys and libjava programs.
86CONFIGURE_ENV+= LDFLAGS_FOR_TARGET=${LDFLAGS_FOR_TARGET:Q} 87CONFIGURE_ENV+= LDFLAGS_FOR_TARGET=${LDFLAGS_FOR_TARGET:Q}
87 88
88CONFIGURE_ARGS+= --enable-languages=${LANGS:Q} 89CONFIGURE_ARGS+= --enable-languages=${LANGS:Q}
89CONFIGURE_ARGS+= --enable-shared 90CONFIGURE_ARGS+= --enable-shared
90CONFIGURE_ARGS+= --enable-long-long 91CONFIGURE_ARGS+= --enable-long-long
91CONFIGURE_ARGS+= --with-local-prefix=${GCC_PREFIX:Q} 92CONFIGURE_ARGS+= --with-local-prefix=${GCC_PREFIX:Q}
92CONFIGURE_ARGS+= --enable-threads=posix 93CONFIGURE_ARGS+= --enable-threads=posix
93CONFIGURE_ARGS+= --with-boot-ldflags=${BOOT_LDFLAGS:Q} 94CONFIGURE_ARGS+= --with-boot-ldflags=${BOOT_LDFLAGS:Q}
94CONFIGURE_ARGS.NetBSD+= --with-gnu-ld --with-ld=/usr/bin/ld 95CONFIGURE_ARGS.NetBSD+= --with-gnu-ld --with-ld=/usr/bin/ld
95CONFIGURE_ARGS.NetBSD+= --with-gnu-as --with-as=/usr/bin/as 96CONFIGURE_ARGS.NetBSD+= --with-gnu-as --with-as=/usr/bin/as
96MAKE_ENV.NetBSD+= ac_cv_func_clock_gettime=yes 97MAKE_ENV.NetBSD+= ac_cv_func_clock_gettime=yes
97MAKE_ENV.NetBSD+= ac_cv_func_gethostbyname_r=no 98MAKE_ENV.NetBSD+= ac_cv_func_gethostbyname_r=no
98MAKE_ENV.NetBSD+= ac_cv_func_freelocale=no 99MAKE_ENV.NetBSD+= ac_cv_func_freelocale=no
99MAKE_ENV.NetBSD+= ac_cv_func_newlocale=no 100MAKE_ENV.NetBSD+= ac_cv_func_newlocale=no
100MAKE_ENV.NetBSD+= ac_cv_func_uselocale=no 101MAKE_ENV.NetBSD+= ac_cv_func_uselocale=no
101 102
102CONFIGURE_ARGS.DragonFly+= --disable-bootstrap 103CONFIGURE_ARGS.DragonFly+= --disable-bootstrap
103 104
104.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || !empty(MACHINE_PLATFORM:MLinux-*-i386) 105.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || !empty(MACHINE_PLATFORM:MLinux-*-i386)
105CONFIGURE_ARGS+= --with-arch=i486 --with-tune=i486 106CONFIGURE_ARGS+= --with-arch=i486 --with-tune=i486
106.endif 107.endif
107 108
108.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || !empty(MACHINE_PLATFORM:MLinux-*-x86_64) 109.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || !empty(MACHINE_PLATFORM:MLinux-*-x86_64)
109CONFIGURE_ARGS+= --with-arch=nocona --with-tune=nocona --with-fpmath=sse 110CONFIGURE_ARGS+= --with-arch=nocona --with-tune=nocona --with-fpmath=sse
110.endif 111.endif
111 112
112.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*) 113.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
113CONFIGURE_ARGS+= --with-dwarf2 114CONFIGURE_ARGS+= --with-dwarf2
114.endif 115.endif
115 116
116 117
117# ${WRKSRC}/fixincludes/ looks for sed and compiles the path to sed into 118# ${WRKSRC}/fixincludes/ looks for sed and compiles the path to sed into
118# a binary so we need to make sure we give it the installed sed and not 119# a binary so we need to make sure we give it the installed sed and not
119# the tool wrapped one. 120# the tool wrapped one.
120MAKE_ENV+= ac_cv_path_SED=${TOOLS_SED} 121MAKE_ENV+= ac_cv_path_SED=${TOOLS_SED}
121MAKE_ENV+= lt_cv_path_SED=${TOOLS_SED} 122MAKE_ENV+= lt_cv_path_SED=${TOOLS_SED}
122 123
123# Determine whether to use binutils 124# Determine whether to use binutils
124.if ${OPSYS} == "SunOS" 125.if ${OPSYS} == "SunOS"
125. if exists(/usr/sfw/bin/gobjdump) 126. if exists(/usr/sfw/bin/gobjdump)
126CONFIGURE_ENV+= OBJDUMP=/usr/sfw/bin/gobjdump 127CONFIGURE_ENV+= OBJDUMP=/usr/sfw/bin/gobjdump
127. endif 128. endif
128. if exists(/usr/bin/ld) 129. if exists(/usr/bin/ld)
129CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/bin/ld 130CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/bin/ld
130. else 131. else
131CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/ccs/bin/ld 132CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/ccs/bin/ld
132. endif 133. endif
133. if exists(/usr/sfw/bin/gas) 134. if exists(/usr/sfw/bin/gas)
134CONFIGURE_ARGS+= --with-gnu-as --with-as=/usr/sfw/bin/gas 135CONFIGURE_ARGS+= --with-gnu-as --with-as=/usr/sfw/bin/gas
135. elif exists(/usr/ccs/bin/as) 136. elif exists(/usr/ccs/bin/as)
136CONFIGURE_ARGS+= --without-gnu-as --with-as=/usr/ccs/bin/as 137CONFIGURE_ARGS+= --without-gnu-as --with-as=/usr/ccs/bin/as
137. else 138. else
138BUILDLINK_DEPMETHOD.binutils= full 139BUILDLINK_DEPMETHOD.binutils= full
139. include "../../devel/binutils/buildlink3.mk" 140. include "../../devel/binutils/buildlink3.mk"
140CONFIGURE_ARGS+= --with-gnu-as --with-as=${PREFIX}/bin/gas 141CONFIGURE_ARGS+= --with-gnu-as --with-as=${PREFIX}/bin/gas
141. endif 142. endif
142.endif 143.endif
143 144
144.if ${OS_VARIANT} == "SmartOS" 145.if ${OS_VARIANT} == "SmartOS"
145SUBST_CLASSES+= ccs 146SUBST_CLASSES+= ccs
146SUBST_STAGE.ccs= pre-configure 147SUBST_STAGE.ccs= pre-configure
147SUBST_FILES.ccs= contrib/make_sunver.pl 148SUBST_FILES.ccs= contrib/make_sunver.pl
148SUBST_SED.ccs= -e 's,/usr/ccs/bin,/usr/bin,g' 149SUBST_SED.ccs= -e 's,/usr/ccs/bin,/usr/bin,g'
149.endif 150.endif
150 151
151pre-configure: 152pre-configure:
152 ${RUN} cd ${WRKSRC} && ${MKDIR} ${OBJDIR} 153 ${RUN} cd ${WRKSRC} && ${MKDIR} ${OBJDIR}
153 154
154TEST_TARGET= -k check || ${TRUE} 155TEST_TARGET= -k check || ${TRUE}
155pre-test: 156pre-test:
156 ${RUN} \ 157 ${RUN} \
157 if runtest --version >/dev/null 2>/dev/null ; then \ 158 if runtest --version >/dev/null 2>/dev/null ; then \
158 : ; \ 159 : ; \
159 else \ 160 else \
160 ${ECHO} "ERROR: Please install devel/dejagnu in order to run the test suite." ; \ 161 ${ECHO} "ERROR: Please install devel/dejagnu in order to run the test suite." ; \
161 exit 1 ; \ 162 exit 1 ; \
162 fi 163 fi
163post-test: 164post-test:
164 ${RUN} cd ${WRKSRC} && cd ${OBJDIR} && \ 165 ${RUN} cd ${WRKSRC} && cd ${OBJDIR} && \
165 ${SHELL} ${WRKSRC}/contrib/test_summary >${WRKDIR}/test_summary.log 166 ${SHELL} ${WRKSRC}/contrib/test_summary >${WRKDIR}/test_summary.log
166 ${INFO_MSG} "Test summary are available in ${WRKDIR}/test_summary.log" 167 ${INFO_MSG} "Test summary are available in ${WRKDIR}/test_summary.log"
167 168
168post-install: 169post-install:
169 ${TEST} -f ${DESTDIR}${GCC_PREFIX}/bin/cc || \ 170 ${TEST} -f ${DESTDIR}${GCC_PREFIX}/bin/cc || \
170 ( cd ${DESTDIR}${GCC_PREFIX}/bin ; ${LN} -f gcc cc ) 171 ( cd ${DESTDIR}${GCC_PREFIX}/bin ; ${LN} -f gcc cc )
171.if !empty(MACHINE_PLATFORM:MSunOS-*-*86*) && ${OS_VERSION} != "5.11" 172.if !empty(MACHINE_PLATFORM:MSunOS-*-*86*) && ${OS_VERSION} != "5.11"
172 ${SH} files/values.c ${DESTDIR}${GCC_PREFIX}/bin/gcc -m32 || ${TRUE} 173 ${SH} files/values.c ${DESTDIR}${GCC_PREFIX}/bin/gcc -m32 || ${TRUE}
173 ${SH} files/values.c ${DESTDIR}${GCC_PREFIX}/bin/gcc -m64 || ${TRUE} 174 ${SH} files/values.c ${DESTDIR}${GCC_PREFIX}/bin/gcc -m64 || ${TRUE}
174.endif 175.endif
175 176
176GENERATE_PLIST+= \ 177GENERATE_PLIST+= \
177 cd ${DESTDIR}${PREFIX} && \ 178 cd ${DESTDIR}${PREFIX} && \
178 ${FIND} ${GCC_SUBPREFIX} \( -type f -o -type l \) -print | ${SORT} ; 179 ${FIND} ${GCC_SUBPREFIX} \( -type f -o -type l \) -print | ${SORT} ;
179 180
180.include "../../mk/dlopen.buildlink3.mk" 181.include "../../mk/dlopen.buildlink3.mk"
181.include "../../mk/pthread.buildlink3.mk" 182.include "../../mk/pthread.buildlink3.mk"
182.include "../../mk/bsd.pkg.mk" 183.include "../../mk/bsd.pkg.mk"