kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix PLIST for libgcc handling.

Browse source
This commit is contained in:
joerg 2020-05-14 19:19:13 +00:00
parent f28cf3db2c
commit a9be2fbf85
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lang/gcc9/PLIST.NetBSD-x86_64
View file

@ -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

13
lang/gcc9/options.mk
View file

@ -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
###