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/gcc5 | |
| 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/gcc5')
| -rw-r--r-- | lang/gcc5/options.mk | 39 |
1 files changed, 36 insertions, 3 deletions
diff --git a/lang/gcc5/options.mk b/lang/gcc5/options.mk index eaa1ae3fbca..86bc245d9f2 100644 --- a/lang/gcc5/options.mk +++ b/lang/gcc5/options.mk @@ -1,15 +1,21 @@ -# $NetBSD: options.mk,v 1.2 2016/02/25 14:42:56 jperkin Exp $ +# $NetBSD: options.mk,v 1.3 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-java + gcc-go gcc-objc gcc-objc++ gcc-graphite gcc-java \ + always-libgcc PKG_SUGGESTED_OPTIONS= gcc-c++ gcc-fortran gcc-objc gcc-objc++ \ gcc-graphite gcc-inplace-math PKG_SUGGESTED_OPTIONS.DragonFly+= nls PKG_SUGGESTED_OPTIONS.Linux+= nls PKG_SUGGESTED_OPTIONS.NetBSD+= nls -PKG_SUGGESTED_OPTIONS.SunOS+= gcc-inplace-math +PKG_SUGGESTED_OPTIONS.SunOS+= gcc-inplace-math always-libgcc + +.include "../../mk/compiler.mk" +.if empty(PKGSRC_COMPILER:Mgcc) +PKG_SUGGESTED_OPTIONS+= always-libgcc +.endif ### ### Determine if multilib is avalible. @@ -54,6 +60,33 @@ CONFIGURE_ARGS+= --disable-multilib .endif ### +### Don't install libgcc if it's older than the system one +### +.include "../../mk/bsd.prefs.mk" +.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} ${GCC5_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 + +### ### Build math libraries in place ### .if !empty(PKG_OPTIONS:Mgcc-inplace-math) |