| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | # $NetBSD: Makefile,v 1.20 2015/04/10 00:32:08 rodent Exp $ | | 1 | # $NetBSD: Makefile,v 1.21 2015/10/09 11:27:23 jperkin Exp $ |
2 | | | 2 | |
3 | GCC_PKGNAME= gcc48 | | 3 | GCC_PKGNAME= gcc48 |
4 | .include "version.mk" | | 4 | .include "version.mk" |
5 | | | 5 | |
6 | DISTNAME= gcc-${GCC48_DIST_VERSION} | | 6 | DISTNAME= gcc-${GCC48_DIST_VERSION} |
7 | PKGNAME= ${GCC_PKGNAME}-${GCC48_DIST_VERSION} | | 7 | PKGNAME= ${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! |
11 | CATEGORIES= lang | | 11 | CATEGORIES= lang |
12 | MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC48_DIST_VERSION}/} | | 12 | MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC48_DIST_VERSION}/} |
13 | EXTRACT_SUFX= .tar.bz2 | | 13 | EXTRACT_SUFX= .tar.bz2 |
14 | | | 14 | |
| @@ -54,26 +54,29 @@ LINKER_RPATH_FLAG:= ${LINKER_RPATH_FLAG: | | | @@ -54,26 +54,29 @@ LINKER_RPATH_FLAG:= ${LINKER_RPATH_FLAG: |
54 | | | 54 | |
55 | ## The Library rpath to use in end programs. | | 55 | ## The Library rpath to use in end programs. |
56 | LDFLAGS_FOR_TARGET= ${LDFLAGS:M${COMPILER_RPATH_FLAG}*:N*/usr/lib*} | | 56 | LDFLAGS_FOR_TARGET= ${LDFLAGS:M${COMPILER_RPATH_FLAG}*:N*/usr/lib*} |
57 | | | 57 | |
58 | # The "-static-libstdc++ -static-libgcc" flags are normally added to the | | 58 | # The "-static-libstdc++ -static-libgcc" flags are normally added to the |
59 | # boot-ldflags by configure but because we are supply the boot-ldflags | | 59 | # boot-ldflags by configure but because we are supply the boot-ldflags |
60 | # we mash supply them. | | 60 | # we mash supply them. |
61 | BOOT_LDFLAGS= -static-libstdc++ -static-libgcc ${LDFLAGS_FOR_TARGET} | | 61 | BOOT_LDFLAGS= -static-libstdc++ -static-libgcc ${LDFLAGS_FOR_TARGET} |
62 | # Needed on Darwin when LDFLAGS point to a SDK | | 62 | # Needed on Darwin when LDFLAGS point to a SDK |
63 | BOOT_LDFLAGS+= ${LDFLAGS:M-Wl,-syslibroot*} | | 63 | BOOT_LDFLAGS+= ${LDFLAGS:M-Wl,-syslibroot*} |
64 | # GCC does not understand this option; remove it, or stage build will fail | | 64 | # GCC does not understand this option; remove it, or stage build will fail |
65 | BUILDLINK_TRANSFORM+= rm:-stdlib=libc++ | | 65 | BUILDLINK_TRANSFORM+= rm:-stdlib=libc++ |
66 | | | 66 | |
| | | 67 | # Ignore missing rpaths in "fake" library. |
| | | 68 | CHECK_SHLIBS_SKIP+= ${GCC_PKGNAME}/lib*/libgcj_bc.so* |
| | | 69 | |
67 | ## For target librarys and libjava programs. | | 70 | ## For target librarys and libjava programs. |
68 | CONFIGURE_ENV+= LDFLAGS_FOR_TARGET=${LDFLAGS_FOR_TARGET:Q} | | 71 | CONFIGURE_ENV+= LDFLAGS_FOR_TARGET=${LDFLAGS_FOR_TARGET:Q} |
69 | | | 72 | |
70 | CONFIGURE_ARGS+= --enable-languages=${LANGS:Q} | | 73 | CONFIGURE_ARGS+= --enable-languages=${LANGS:Q} |
71 | CONFIGURE_ARGS+= --enable-shared | | 74 | CONFIGURE_ARGS+= --enable-shared |
72 | CONFIGURE_ARGS+= --enable-long-long | | 75 | CONFIGURE_ARGS+= --enable-long-long |
73 | CONFIGURE_ARGS+= --with-local-prefix=${GCC_PREFIX:Q} | | 76 | CONFIGURE_ARGS+= --with-local-prefix=${GCC_PREFIX:Q} |
74 | CONFIGURE_ARGS+= --enable-libssp | | 77 | CONFIGURE_ARGS+= --enable-libssp |
75 | CONFIGURE_ARGS+= --enable-threads=posix | | 78 | CONFIGURE_ARGS+= --enable-threads=posix |
76 | CONFIGURE_ARGS+= --with-boot-ldflags=${BOOT_LDFLAGS:Q} | | 79 | CONFIGURE_ARGS+= --with-boot-ldflags=${BOOT_LDFLAGS:Q} |
77 | .if ${OPSYS} == "NetBSD" | | 80 | .if ${OPSYS} == "NetBSD" |
78 | CONFIGURE_ARGS+= --with-gnu-ld --with-ld=/usr/bin/ld | | 81 | CONFIGURE_ARGS+= --with-gnu-ld --with-ld=/usr/bin/ld |
79 | CONFIGURE_ARGS+= --with-gnu-as --with-as=/usr/bin/as | | 82 | CONFIGURE_ARGS+= --with-gnu-as --with-as=/usr/bin/as |