Source Mage code commit list

[Ismael Luceno <scm AT sourcemage.org>]

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

 latex/texlive/BUILD     |    4 ++++
 latex/texlive/HISTORY   |    4 ++++
 latex/texlive/PRE_BUILD |    8 ++++----
 3 files changed, 12 insertions(+), 4 deletions(-)

New commits:
commit 50e3eaea79afdc9eecc32cb86e7f38194f5172e5
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    texlive: Optimize data installation prefix patching
    
    Use a single instance of find, and patch as many files at once as
    possible.

commit b0ce2a2c76a18b30f1a2a6a4aca87013673da4b9
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    texlive: Fix build with binutils 2.35+

diff --git a/latex/texlive/BUILD b/latex/texlive/BUILD
index a3d8047..8534682 100755
--- a/latex/texlive/BUILD
+++ b/latex/texlive/BUILD
@@ -1,3 +1,7 @@
+if ! is_version_less $(installed_version binutils) 2.35; then
+  LDFLAGS+=" -Wl,--allow-multiple-definition"
+fi &&
+
 # Flags to allow building against lua 5.3
 #CFLAGS+=" -DLUA_COMPAT_APIINTCASTS"
 
diff --git a/latex/texlive/HISTORY b/latex/texlive/HISTORY
index 8f51281..fe433f7 100644
--- a/latex/texlive/HISTORY
+++ b/latex/texlive/HISTORY
@@ -1,3 +1,7 @@
+2020-08-21 Ismael Luceno <ismael AT sourcemage.org>
+       * BUILD: Fixed build with binutils >= 2.35
+       * PRE_BUILD: Optimized data installation prefix patching
+
 2019-08-13 Pavel Vinogradov <public AT sourcemage.org>
        * DEPENDS: needs ghostscript with libgs
 
diff --git a/latex/texlive/PRE_BUILD b/latex/texlive/PRE_BUILD
index 9bc0d82..882049d 100755
--- a/latex/texlive/PRE_BUILD
+++ b/latex/texlive/PRE_BUILD
@@ -55,10 +55,10 @@ echo '%:;echo $@ target suppressed' > Makefile
 done &&
 
 # Use /usr/share/texmf and /usr/share/texmf-dist, adapted from lunarlinux
-find -name Makefile\* -exec sed -i -e 
"s:\(\$.\)prefix\(./tex\):\1datadir\2:" {} \; &&
-find -name configure -exec sed -i -e "s:\(\$.\)prefix\(./tex\):\1datadir\2:" 
{} \; &&
-find -name \*.info -exec sed -i -e "s:/usr/local:/usr:" {} \; &&
-find -name \*.texi -exec sed -i -e "s:/usr/local:/usr:" {} \; &&
+find \( -name Makefile\* -o -name configure \) \
+       -exec sed -i -e "s:\(\$.\)prefix\(./tex\):\1datadir\2:" {} + \
+  -o \( -name \*.info -o -name \*.texi \) \
+       -exec sed -i -e "s:/usr/local:/usr:" {} + &&
 
 # Patch paths in texmf.cnf
 sedit '