CVS commit: pkgsrc/devel/libatomic

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Jul 13 07:53:39 UTC 2021

Modified Files:
        pkgsrc/devel/libatomic: Makefile distinfo
Added Files:
        pkgsrc/devel/libatomic/patches: patch-libatomic_configure

Log Message:
libatomic: Copy hacks to disable multilib from libquadmath


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/libatomic/Makefile \
    pkgsrc/devel/libatomic/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/libatomic/patches/patch-libatomic_configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/libatomic/Makefile
diff -u pkgsrc/devel/libatomic/Makefile:1.3 pkgsrc/devel/libatomic/Makefile:1.4
--- pkgsrc/devel/libatomic/Makefile:1.3 Mon Apr 19 14:07:49 2021
+++ pkgsrc/devel/libatomic/Makefile     Tue Jul 13 07:53:38 2021
@@ -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 @@ OBJDIR=                       ../build
 CONFIGURE_DIRS=                ${OBJDIR}
 CONFIGURE_SCRIPT=      ../${DISTNAME}/libatomic/configure
 
+CONFIGURE_ARGS+=       --disable-multilib
+
 CHECK_PORTABILITY_SKIP+=       contrib/*
 
 .include "../../mk/bsd.prefs.mk"
Index: pkgsrc/devel/libatomic/distinfo
diff -u pkgsrc/devel/libatomic/distinfo:1.3 pkgsrc/devel/libatomic/distinfo:1.4
--- pkgsrc/devel/libatomic/distinfo:1.3 Mon Apr 19 14:07:49 2021
+++ pkgsrc/devel/libatomic/distinfo     Tue Jul 13 07:53:38 2021
@@ -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

Added files:

Index: pkgsrc/devel/libatomic/patches/patch-libatomic_configure
diff -u /dev/null pkgsrc/devel/libatomic/patches/patch-libatomic_configure:1.1
--- /dev/null   Tue Jul 13 07:53:39 2021
+++ pkgsrc/devel/libatomic/patches/patch-libatomic_configure    Tue Jul 13 07:53:38 2021
@@ -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"