diff options
| author | maya <maya@pkgsrc.org> | 2019-09-08 14:47:52 +0000 |
|---|---|---|
| committer | maya <maya@pkgsrc.org> | 2019-09-08 14:47:52 +0000 |
| commit | 31ce94372a5c8e3f1435c7ae0e50cd7bdd080061 (patch) | |
| tree | 9afe91785cc6a6f1c303d70f21be70e7435b2536 /lang/gcc8 | |
| parent | bdeaab7b6acd5f155be8f57a81613519812b1d38 (diff) | |
| download | pkgsrc-31ce94372a5c8e3f1435c7ae0e50cd7bdd080061.tar.gz | |
gcc{48,49,5,6,7,8}: In the case of a "system GCC", detect if the system
libgcc is newer than the one about to be installed. If so, don't install
the libgcc.
Having an older libgcc appear in the lookup may result in binaries not
running, as they need symbols from the newer libgcc.
Such a case is PR pkg/54506.
Leaves SunOS unchanged, by request from jperkin.
Diffstat (limited to 'lang/gcc8')
| -rw-r--r-- | lang/gcc8/options.mk | 38 |
1 files changed, 35 insertions, 3 deletions
diff --git a/lang/gcc8/options.mk b/lang/gcc8/options.mk index fcce905d53f..894eb59b015 100644 --- a/lang/gcc8/options.mk +++ b/lang/gcc8/options.mk @@ -1,8 +1,9 @@ -# $NetBSD: options.mk,v 1.1 2018/05/05 04:08:36 maya Exp $ +# $NetBSD: options.mk,v 1.2 2019/09/08 14:47:52 maya Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.${GCC_PKGNAME} PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-c++ gcc-fortran \ - gcc-go gcc-objc gcc-objc++ gcc-graphite + gcc-go gcc-objc gcc-objc++ gcc-graphite \ + always-libgcc PKG_SUGGESTED_OPTIONS= gcc-c++ gcc-fortran gcc-objc gcc-objc++ \ gcc-graphite gcc-inplace-math @@ -13,10 +14,15 @@ PKG_SUGGESTED_OPTIONS+= nls .elif ${OPSYS} == "DragonFly" PKG_SUGGESTED_OPTIONS+= nls .elif ${OPSYS} == "SunOS" -PKG_SUGGESTED_OPTIONS+= gcc-inplace-math +PKG_SUGGESTED_OPTIONS+= gcc-inplace-math always-libgcc .else .endif +.include "../../mk/compiler.mk" +.if empty(PKGSRC_COMPILER:Mgcc) +PKG_SUGGESTED_OPTIONS+= always-libgcc +.endif + ### ### Determine if multilib is avalible. ### @@ -42,6 +48,32 @@ PKG_SUGGESTED_OPTIONS+= gcc-multilib .include "../../mk/bsd.options.mk" ### +### Don't install libgcc if it's older than the system one +### +.if empty(PKG_OPTIONS:Malways-libgcc) + +.for _libdir_ in ${_OPSYS_LIB_DIRS} +. if exists(${_libdir_}) +BASE_LIBGCC!= find ${_libdir_} -name libgcc_s.so +BASE_LIBGCC_MATCH_STRING!= ${ECHO} ${BASE_LIBGCC} ${GCC8_DIST_VERSION} | \ + ${AWK} -f ../../mk/scripts/larger_symbol_version.awk +. if ${BASE_LIBGCC_MATCH_STRING:Mnewer} +DELETE_INSTALLED_LIBGCC= yes +. endif +. endif +.endfor + +.if ${DELETE_INSTALLED_LIBGCC:Uno} +post-install: delete-installed-libgcc + +delete-installed-libgcc: + ${FIND} ${DESTDIR} -name 'libgcc_s.so*' -delete + +.endif + +.endif + +### ### Native Language Support ### .if !empty(PKG_OPTIONS:Mnls) |