[pkgsrc/trunk]: pkgsrc/lang/gcc9 Fix PLIST for libgcc handling.

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/acdaa5a6a711
branches:  trunk
changeset: 431582:acdaa5a6a711
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu May 14 19:19:13 2020 +0000

description:
Fix PLIST for libgcc handling.

diffstat:

 lang/gcc9/PLIST.NetBSD-x86_64 |   4 +++-
 lang/gcc9/options.mk          |  13 +++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diffs (57 lines):

diff -r b38182bd8e22 -r acdaa5a6a711 lang/gcc9/PLIST.NetBSD-x86_64
--- a/lang/gcc9/PLIST.NetBSD-x86_64     Thu May 14 19:18:54 2020 +0000
+++ b/lang/gcc9/PLIST.NetBSD-x86_64     Thu May 14 19:19:13 2020 +0000
@@ -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/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 -r b38182bd8e22 -r acdaa5a6a711 lang/gcc9/options.mk
--- a/lang/gcc9/options.mk      Thu May 14 19:18:54 2020 +0000
+++ b/lang/gcc9/options.mk      Thu May 14 19:19:13 2020 +0000
@@ -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 @@
 ###
 ### 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 @@
 .    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
 
 ###