diff options
| author | joerg <joerg@pkgsrc.org> | 2020-05-14 19:19:13 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2020-05-14 19:19:13 +0000 |
| commit | 328021307623a7fbc8ad72461cfe577b67000cb0 (patch) | |
| tree | 3da20d3f23120bcb68646882f9508968a1d72738 /lang | |
| parent | ab9531a18f13bf665ebeb7d762afa30d7badadbd (diff) | |
| download | pkgsrc-328021307623a7fbc8ad72461cfe577b67000cb0.tar.gz | |
Fix PLIST for libgcc handling.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/gcc9/PLIST.NetBSD-x86_64 | 4 | ||||
| -rw-r--r-- | lang/gcc9/options.mk | 13 |
2 files changed, 14 insertions, 3 deletions
diff --git a/lang/gcc9/PLIST.NetBSD-x86_64 b/lang/gcc9/PLIST.NetBSD-x86_64 index c2d84f007a2..4186cfa09da 100644 --- a/lang/gcc9/PLIST.NetBSD-x86_64 +++ b/lang/gcc9/PLIST.NetBSD-x86_64 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.NetBSD-x86_64,v 1.3 2020/04/08 16:35:59 wiz Exp $ +@comment $NetBSD: PLIST.NetBSD-x86_64,v 1.4 2020/05/14 19:19:13 joerg Exp $ gcc9/bin/c++ gcc9/bin/cc gcc9/bin/cpp @@ -1392,6 +1392,8 @@ gcc9/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/libcc1plugin.la gcc9/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/libcp1plugin.la gcc9/lib/libatomic.la gcc9/lib/libcc1.la +${PLIST.libgcc}gcc9/lib/libgcc_s.so +${PLIST.libgcc}gcc9/lib/libgcc_s.so.1 ${PLIST.fortran}gcc9/lib/libgfortran.la ${PLIST.fortran}gcc9/lib/libgfortran.spec gcc9/lib/libgomp.la diff --git a/lang/gcc9/options.mk b/lang/gcc9/options.mk index a5d381d9cc7..b2e0ec279cd 100644 --- a/lang/gcc9/options.mk +++ b/lang/gcc9/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2020/01/11 09:48:11 rillig Exp $ +# $NetBSD: options.mk,v 1.5 2020/05/14 19:19:13 joerg Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gcc9 PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-c++ gcc-fortran \ @@ -42,6 +42,7 @@ PKG_SUGGESTED_OPTIONS+= gcc-multilib ### ### Don't install libgcc if it's older than the system one ### +PLIST_VARS+= libgcc .if !${PKG_OPTIONS:Malways-libgcc} . for dir in ${_OPSYS_LIB_DIRS} @@ -56,12 +57,20 @@ DELETE_INSTALLED_LIBGCC= yes . endif . endfor -. if ${DELETE_INSTALLED_LIBGCC:Uno} +. if ${DELETE_INSTALLED_LIBGCC:Uno} == "yes" post-install: delete-installed-libgcc delete-installed-libgcc: .PHONY ${FIND} ${DESTDIR} -name 'libgcc_s.so*' -delete +. else +PLIST.libgcc= yes . endif +.else +PLIST.libgcc= yes +.endif + +.if ${PLIST.libgcc:Uno} == "yes" +LDFLAGS+= -Wl,-rpath,${PREFIX}/gcc9/lib .endif ### |