[pkgsrc/trunk]: pkgsrc/devel/libatomic libatomic: Copy hacks to disable multi...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4576d347403b
branches:  trunk
changeset: 455848:4576d347403b
user:      nia <nia%pkgsrc.org@localhost>
date:      Tue Jul 13 07:53:38 2021 +0000

description:
libatomic: Copy hacks to disable multilib from libquadmath

diffstat:

 devel/libatomic/Makefile                          |   4 ++-
 devel/libatomic/distinfo                          |   3 +-
 devel/libatomic/patches/patch-libatomic_configure |  25 +++++++++++++++++++++++
 3 files changed, 30 insertions(+), 2 deletions(-)

diffs (59 lines):

diff -r 7aae09160c31 -r 4576d347403b devel/libatomic/Makefile
--- a/devel/libatomic/Makefile  Tue Jul 13 07:51:29 2021 +0000
+++ b/devel/libatomic/Makefile  Tue Jul 13 07:53:38 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2021/04/19 14:07:49 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2021/07/13 07:53:38 nia Exp $
 
 DISTNAME=      gcc-10.3.0
 PKGNAME=       ${DISTNAME:S/gcc/libatomic/}
@@ -22,6 +22,8 @@
 CONFIGURE_DIRS=                ${OBJDIR}
 CONFIGURE_SCRIPT=      ../${DISTNAME}/libatomic/configure
 
+CONFIGURE_ARGS+=       --disable-multilib
+
 CHECK_PORTABILITY_SKIP+=       contrib/*
 
 .include "../../mk/bsd.prefs.mk"
diff -r 7aae09160c31 -r 4576d347403b devel/libatomic/distinfo
--- a/devel/libatomic/distinfo  Tue Jul 13 07:51:29 2021 +0000
+++ b/devel/libatomic/distinfo  Tue Jul 13 07:53:38 2021 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2021/04/19 14:07:49 wiz Exp $
+$NetBSD: distinfo,v 1.4 2021/07/13 07:53:38 nia Exp $
 
 SHA1 (gcc-10.3.0.tar.xz) = fb51ed1660c065898c75951fb38e1ebad7d49feb
 RMD160 (gcc-10.3.0.tar.xz) = 8edb715cf1159fd8de773d0d5208d2e83ca36402
 SHA512 (gcc-10.3.0.tar.xz) = 2b2dd7453d48a398c29eaebd1422b70341001b8c90a62aee51e83344e7fdd8a8e45f82a4a9165bd7edc76dada912c932f4b6632c5636760fec4c5d7e402b3f86
 Size (gcc-10.3.0.tar.xz) = 76692288 bytes
+SHA1 (patch-libatomic_configure) = 9ca952bc6e48dc37dd79d3fb050194de460f0898
diff -r 7aae09160c31 -r 4576d347403b devel/libatomic/patches/patch-libatomic_configure
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/libatomic/patches/patch-libatomic_configure Tue Jul 13 07:53:38 2021 +0000
@@ -0,0 +1,25 @@
+$NetBSD: patch-libatomic_configure,v 1.1 2021/07/13 07:53:38 nia Exp $
+
+Do not use multi-lib directories for library installation,
+always install to /lib.
+
+--- libatomic/configure.orig   2021-04-08 11:56:29.753761012 +0000
++++ libatomic/configure
+@@ -3393,7 +3393,7 @@ case ${enable_version_specific_runtime_l
+     multi_os_directory=`$CC -print-multi-os-directory`
+     case $multi_os_directory in
+       .) ;; # Avoid trailing /.
+-      *) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
++      *) toolexeclibdir=$toolexeclibdir ;;
+     esac
+     ;;
+ esac
+@@ -10305,7 +10305,7 @@ if test "$GCC" = yes; then
+   lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+   for lt_sys_path in $lt_search_path_spec; do
+     if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
++      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+     else
+       test -d "$lt_sys_path" && \
+       lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"