diff options
| author | Thomas Orgis | 2020-09-08 01:20:05 +0200 |
|---|---|---|
| committer | Thomas Orgis | 2020-09-08 01:28:17 +0200 |
| commit | 7c661728f5bf8acbd0d3304f9786c047d46e2b41 (patch) | |
| tree | f3b17d4d377e7a51dd0f2459d1339bc77de0719e /gnu | |
| parent | 27d8a937d7b34a0525ea1e3f12475f0c232a7a4e (diff) | |
gcc: drop .la files from installation
This uses the recently introduced infrastructure to influence the
multi-faced build of gcc to avoid libtool archives and also triggers
anything in the system that references things like libstdc++.la.
It worked for me.
The rational for dropping those .la files is that it seems consensus
among GNU/Linux distros to do so and it is just assumed that basic
toolchain libraries from GCC do not appear in libtool form. The pkgsrc
build framework stumbles over this, for example, on an SMGL box. While
one could argue that support and correct handling of /usr/lib/libstc++.la
and friends is a justified bug fix, the other side of the argument is
that nobody else installs those unnecessary libtool archives. They are
implied when you call g++ or gfortran. They really make no sense and
are just clutter anyway.
Convincing upstream to skip generating them would be a perhaps worthwhile
goal, but they may have their reasons and, well, any other distro is capable
of filtering them in the packaging process.
Diffstat (limited to 'gnu')
| -rwxr-xr-x | gnu/gcc/DETAILS | 2 | ||||
| -rw-r--r-- | gnu/gcc/HISTORY | 4 | ||||
| -rwxr-xr-x | gnu/gcc/PRE_BUILD | 3 | ||||
| -rwxr-xr-x | gnu/gcc/UP_TRIGGERS | 5 |
4 files changed, 13 insertions, 1 deletions
diff --git a/gnu/gcc/DETAILS b/gnu/gcc/DETAILS index 51421d0d58..b74e1d19a6 100755 --- a/gnu/gcc/DETAILS +++ b/gnu/gcc/DETAILS @@ -1,7 +1,7 @@ SPELL=gcc VERSION=10.2.0 ISL_VERSION=0.20 - PATCHLEVEL=3 + PATCHLEVEL=4 BASE_SOURCE_URL="https://ftp.gnu.org/pub/gnu/gcc/gcc-$VERSION" SOURCE=gcc-$VERSION.tar.xz SOURCE2=$SOURCE.sig diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY index 78c125b442..86bbd46877 100644 --- a/gnu/gcc/HISTORY +++ b/gnu/gcc/HISTORY @@ -1,3 +1,7 @@ +2020-09-03 Thomas Orgis <sobukus@sourcemage.org> + * PRE_BUILD: drop .la files from installation + * DETAILS: ++PATCHLEVEL + 2020-07-23 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 10.2.0 diff --git a/gnu/gcc/PRE_BUILD b/gnu/gcc/PRE_BUILD index 959dbeec18..90609a9111 100755 --- a/gnu/gcc/PRE_BUILD +++ b/gnu/gcc/PRE_BUILD @@ -31,6 +31,9 @@ fi && cd ${SOURCE_DIRECTORY} && +# Drop .la files like everyone else. +find . -name Makefile.in \ +| xargs sed -i 's,^\(LIBTOOL[[:space:]]*=[[:space:]]*\),\1'"$GRIMOIRE"'/libtool-nola ,' && mk_source_dir $SOURCE_DIRECTORY.bld && cd $SOURCE_DIRECTORY && diff --git a/gnu/gcc/UP_TRIGGERS b/gnu/gcc/UP_TRIGGERS index 2babc48f5e..dd4122475b 100755 --- a/gnu/gcc/UP_TRIGGERS +++ b/gnu/gcc/UP_TRIGGERS @@ -34,3 +34,8 @@ if [[ ${OLD_SPELL_VERSION%%.*} < "5" ]];then fi # not v5 fi fi + +if [[ -e "$INSTALL_ROOT/usr/lib/libstdc++.la" ]]; then + . $GRIMOIRE/la_remove_up_trigger.function + la_remove_up_trigger 1 +fi |