pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc
Module Name: pkgsrc
Committed By: maya
Date: Sun Sep 8 14:47:53 UTC 2019
Modified Files:
pkgsrc/lang/gcc48: options.mk
pkgsrc/lang/gcc49: options.mk
pkgsrc/lang/gcc5: options.mk
pkgsrc/lang/gcc6: options.mk
pkgsrc/lang/gcc7: options.mk
pkgsrc/lang/gcc8: options.mk
Added Files:
pkgsrc/mk/scripts: larger_symbol_version.awk
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/gcc48/options.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/gcc49/options.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/gcc5/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/gcc6/options.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/gcc7/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/gcc8/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/mk/scripts/larger_symbol_version.awk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/lang/gcc48/options.mk
diff -u pkgsrc/lang/gcc48/options.mk:1.11 pkgsrc/lang/gcc48/options.mk:1.12
--- pkgsrc/lang/gcc48/options.mk:1.11 Fri Sep 30 13:16:59 2016
+++ pkgsrc/lang/gcc48/options.mk Sun Sep 8 14:47:53 2019
@@ -1,17 +1,22 @@
-# $NetBSD: options.mk,v 1.11 2016/09/30 13:16:59 sevan Exp $
+# $NetBSD: options.mk,v 1.12 2019/09/08 14:47:53 maya Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.${GCC_PKGNAME}
PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-c++ gcc-fortran gcc-java \
- 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
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
# gcc-java was dropped from PKG_SUGGESTED_OPTIONS to spare legacy systems attempting bulkbuilds
# For example on Darwin/PowerPC this option adds another 24 hours to build time on a G4.
+.include "../../mk/compiler.mk"
+.if empty(PKGSRC_COMPILER:Mgcc)
+PKG_SUGGESTED_OPTIONS+= always-libgcc
+.endif
+
###
### Determine if multilib is avalible.
###
@@ -55,6 +60,32 @@ CONFIGURE_ARGS+= --disable-multilib
.endif
###
+### 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} ${GCC48_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)
Index: pkgsrc/lang/gcc49/options.mk
diff -u pkgsrc/lang/gcc49/options.mk:1.3 pkgsrc/lang/gcc49/options.mk:1.4
--- pkgsrc/lang/gcc49/options.mk:1.3 Fri Sep 30 13:17:00 2016
+++ pkgsrc/lang/gcc49/options.mk Sun Sep 8 14:47:53 2019
@@ -1,17 +1,22 @@
-# $NetBSD: options.mk,v 1.3 2016/09/30 13:17:00 sevan Exp $
+# $NetBSD: options.mk,v 1.4 2019/09/08 14:47:53 maya Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.${GCC_PKGNAME}
PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-c++ gcc-fortran gcc-java \
- gcc-go gcc-objc gcc-objc++
+ gcc-go gcc-objc gcc-objc++ always-libgcc
PKG_SUGGESTED_OPTIONS= gcc-c++ gcc-fortran gcc-objc gcc-objc++
PKG_SUGGESTED_OPTIONS.DragonFly+= nls
PKG_SUGGESTED_OPTIONS.Linux+= nls
PKG_SUGGESTED_OPTIONS.NetBSD+= nls
-PKG_SUGGESTED_OPTIONS.SunOS+= gcc-go gcc-inplace-math
+PKG_SUGGESTED_OPTIONS.SunOS+= gcc-go gcc-inplace-math always-libgcc
# gcc-java was dropped from PKG_SUGGESTED_OPTIONS to spare legacy systems attempting bulkbuilds
# For example on Darwin/PowerPC this option adds another 24 hours to build time on a G4.
+.include "../../mk/compiler.mk"
+.if empty(PKGSRC_COMPILER:Mgcc)
+PKG_SUGGESTED_OPTIONS+= always-libgcc
+.endif
+
###
### Determine if multilib is avalible.
###
@@ -55,6 +60,32 @@ CONFIGURE_ARGS+= --disable-multilib
.endif
###
+### 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} ${GCC49_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)
Index: pkgsrc/lang/gcc5/options.mk
diff -u pkgsrc/lang/gcc5/options.mk:1.2 pkgsrc/lang/gcc5/options.mk:1.3
--- pkgsrc/lang/gcc5/options.mk:1.2 Thu Feb 25 14:42:56 2016
+++ pkgsrc/lang/gcc5/options.mk Sun Sep 8 14:47:52 2019
@@ -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)
Index: pkgsrc/lang/gcc6/options.mk
diff -u pkgsrc/lang/gcc6/options.mk:1.1 pkgsrc/lang/gcc6/options.mk:1.2
--- pkgsrc/lang/gcc6/options.mk:1.1 Mon Sep 12 22:13:54 2016
+++ pkgsrc/lang/gcc6/options.mk Sun Sep 8 14:47:52 2019
@@ -1,8 +1,9 @@
-# $NetBSD: options.mk,v 1.1 2016/09/12 22:13:54 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-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
@@ -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.
###
@@ -60,6 +66,32 @@ CONFIGURE_ARGS+= --disable-multilib
.endif
###
+### 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} ${GCC6_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)
Index: pkgsrc/lang/gcc7/options.mk
diff -u pkgsrc/lang/gcc7/options.mk:1.4 pkgsrc/lang/gcc7/options.mk:1.5
--- pkgsrc/lang/gcc7/options.mk:1.4 Sat Jan 5 00:39:13 2019
+++ pkgsrc/lang/gcc7/options.mk Sun Sep 8 14:47:52 2019
@@ -1,8 +1,9 @@
-# $NetBSD: options.mk,v 1.4 2019/01/05 00:39:13 adam Exp $
+# $NetBSD: options.mk,v 1.5 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
@@ -10,6 +11,13 @@ PKG_SUGGESTED_OPTIONS= gcc-c++ gcc-fortr
PKG_SUGGESTED_OPTIONS+= nls
.endif
+.include "../../mk/compiler.mk"
+.if empty(PKGSRC_COMPILER:Mgcc)
+PKG_SUGGESTED_OPTIONS+= always-libgcc
+.endif
+
+PKG_SUGGESTED_OPTIONS.SunOS+= always-libgcc
+
###
### Determine if multilib is avalible.
###
@@ -58,6 +66,32 @@ CONFIGURE_ARGS+= --disable-multilib
.endif
###
+### 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} ${GCC7_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)
Index: pkgsrc/lang/gcc8/options.mk
diff -u pkgsrc/lang/gcc8/options.mk:1.1 pkgsrc/lang/gcc8/options.mk:1.2
--- pkgsrc/lang/gcc8/options.mk:1.1 Sat May 5 04:08:36 2018
+++ pkgsrc/lang/gcc8/options.mk Sun Sep 8 14:47:52 2019
@@ -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)
Added files:
Index: pkgsrc/mk/scripts/larger_symbol_version.awk
diff -u /dev/null pkgsrc/mk/scripts/larger_symbol_version.awk:1.1
--- /dev/null Sun Sep 8 14:47:53 2019
+++ pkgsrc/mk/scripts/larger_symbol_version.awk Sun Sep 8 14:47:53 2019
@@ -0,0 +1,81 @@
+#!/usr/bin/awk -f
+
+# $NetBSD: larger_symbol_version.awk,v 1.1 2019/09/08 14:47:53 maya Exp $
+
+# Copyright (c) 2019 Maya Rashish <maya%NetBSD.org@localhost>.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Maya Rashish.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+
+# For each absolute symbol in an ELF binary, extract the component
+# of the symbol name that looks like a version.
+#
+# If the supplied version is larger, return 1
+#
+# example:
+# echo "/usr/lib/libgcc_s.so 3.4" | awk -f larger_symbol_version.awk
+
+BEGIN {
+ nm = ENVIRON["NM"]
+ if (nm == "")
+ nm = "nm"
+}
+
+
+function largest_symbol_version(ELF) {
+ cmd = nm " -D " ELF " 2>/dev/null"
+ while ((cmd | getline) > 0) {
+ # Absolute symbol of the form ALPHABET_3.4
+ if (($2 == "A") && ($3 ~ /[A-Za-z_]*[0-9]*\.[0-9]*/)) {
+ split($3, matches, ".")
+
+ sub(/[A-Za-z_]*/,"",matches[1])
+
+ current_major = int(matches[1])
+ current_minor = int(matches[2])
+
+ if ((current_major > target_major) ||
+ ((current_major == target_major) &&
+ (current_minor > target_minor))) {
+ print "the version of " ELF " is newer than target version " target_major "." target_minor
+ exit 0
+ }
+ }
+ }
+ print "the version of " ELF " is older or equal to target version " target_major "." target_minor
+ exit 0
+}
+
+{
+
+ split($NF, target_version, ".")
+ target_major = target_version[1]
+ target_minor = target_version[2]
+
+ largest_symbol_version($1);
+}
Home |
Main Index |
Thread Index |
Old Index