pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/gcc9 lang/gcc9: return to generated PLIST, we don...
details: https://anonhg.NetBSD.org/pkgsrc/rev/8f7b9411100a
branches: trunk
changeset: 446160:8f7b9411100a
user: maya <maya%pkgsrc.org@localhost>
date: Fri Feb 05 10:28:40 2021 +0000
description:
lang/gcc9: return to generated PLIST, we don't have an answer to include-fixed
Remove workaround for RHEL 7. This workaround resulted in gcc/configure
failing to find dlfcn.h. The build doesn't appear to need it.
Fixes install on both Fedora 33 and CentOS 7 (the docker image, at least).
diffstat:
lang/gcc9/Makefile | 21 +-
lang/gcc9/PLIST | 4 -
lang/gcc9/PLIST.Darwin-x86_64 | 1496 -----------------------------------------
lang/gcc9/PLIST.Linux-x86_64 | 1487 ----------------------------------------
lang/gcc9/PLIST.NetBSD-x86_64 | 1476 ----------------------------------------
5 files changed, 4 insertions(+), 4480 deletions(-)
diffs (truncated from 4521 to 300 lines):
diff -r ca3d668420a6 -r 8f7b9411100a lang/gcc9/Makefile
--- a/lang/gcc9/Makefile Fri Feb 05 09:30:25 2021 +0000
+++ b/lang/gcc9/Makefile Fri Feb 05 10:28:40 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2020/12/04 20:45:26 nia Exp $
+# $NetBSD: Makefile,v 1.26 2021/02/05 10:28:40 maya Exp $
GCC_PKGNAME= gcc9
.include "version.mk"
@@ -42,16 +42,6 @@
.include "../../mk/bsd.prefs.mk"
-# Prevent compilation error on RedHat EL 7:
-#
-# compute_powtab.c: In function 'mpn_compute_powtab_mul':
-# compute_powtab.c:142:3: error: 'for' loop initial declarations are only allowed in C99 mode
-# for (long pi = start_idx; pi >= 0; pi--)
-#
-# I know that -std is not a preprocessor flag, but gcc9 ignores the CFLAGS,
-# for whatever reason.
-CPPFLAGS.Linux+= -std=gnu99
-
# Even though the build and target host is x86_64-sun-solaris2.11,
# it fails to compile some seemingly linux-specific code.
# https://bugs.llvm.org/show_bug.cgi?id=44665
@@ -199,12 +189,9 @@
${TEST} -f ${DESTDIR}${GCC9_PREFIX}/bin/cc \
|| (cd ${DESTDIR}${GCC9_PREFIX}/bin && ${LN} -f gcc cc)
-PLIST_VARS+= fixed-malloc
-.if ${MACHINE_PLATFORM:MNetBSD-9.*-*}
-PLIST.fixed-malloc= yes
-.endif
-
-PRINT_PLIST_AWK+= { gsub("${MACHINE_GNU_PLATFORM}", "$${MACHINE_GNU_PLATFORM}"); }
+GENERATE_PLIST+= \
+ cd ${DESTDIR}${PREFIX} && \
+ ${FIND} ${GCC_SUBPREFIX} \( -type f -o -type l \) -print | ${SORT};
.include "../../devel/zlib/buildlink3.mk"
.include "../../lang/python/application.mk"
diff -r ca3d668420a6 -r 8f7b9411100a lang/gcc9/PLIST
--- a/lang/gcc9/PLIST Fri Feb 05 09:30:25 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2020/01/10 00:28:03 rillig Exp $
-@comment See the platform-specific files for the actual file lists.
-@comment After collecting these lists for several platforms, the
-@comment common parts may be extracted into common files.
diff -r ca3d668420a6 -r 8f7b9411100a lang/gcc9/PLIST.Darwin-x86_64
--- a/lang/gcc9/PLIST.Darwin-x86_64 Fri Feb 05 09:30:25 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1496 +0,0 @@
-@comment $NetBSD: PLIST.Darwin-x86_64,v 1.3 2020/02/29 19:30:19 adam Exp $
-gcc9/bin/c++
-gcc9/bin/cc
-gcc9/bin/cpp
-gcc9/bin/g++
-gcc9/bin/gcc
-gcc9/bin/gcc-ar
-gcc9/bin/gcc-nm
-gcc9/bin/gcc-ranlib
-gcc9/bin/gcov
-gcc9/bin/gcov-dump
-gcc9/bin/gcov-tool
-${PLIST.fortran}gcc9/bin/gfortran
-gcc9/bin/${MACHINE_GNU_PLATFORM}-c++
-gcc9/bin/${MACHINE_GNU_PLATFORM}-g++
-gcc9/bin/${MACHINE_GNU_PLATFORM}-gcc
-gcc9/bin/${MACHINE_GNU_PLATFORM}-gcc-${PKGVERSION}
-gcc9/bin/${MACHINE_GNU_PLATFORM}-gcc-ar
-gcc9/bin/${MACHINE_GNU_PLATFORM}-gcc-nm
-gcc9/bin/${MACHINE_GNU_PLATFORM}-gcc-ranlib
-${PLIST.fortran}gcc9/bin/${MACHINE_GNU_PLATFORM}-gfortran
-${CXXINCDIR}/algorithm
-${CXXINCDIR}/any
-${CXXINCDIR}/array
-${CXXINCDIR}/atomic
-${CXXINCDIR}/backward/auto_ptr.h
-${CXXINCDIR}/backward/backward_warning.h
-${CXXINCDIR}/backward/binders.h
-${CXXINCDIR}/backward/hash_fun.h
-${CXXINCDIR}/backward/hash_map
-${CXXINCDIR}/backward/hash_set
-${CXXINCDIR}/backward/hashtable.h
-${CXXINCDIR}/backward/strstream
-${CXXINCDIR}/bit
-${CXXINCDIR}/bits/algorithmfwd.h
-${CXXINCDIR}/bits/alloc_traits.h
-${CXXINCDIR}/bits/allocated_ptr.h
-${CXXINCDIR}/bits/allocator.h
-${CXXINCDIR}/bits/atomic_base.h
-${CXXINCDIR}/bits/atomic_futex.h
-${CXXINCDIR}/bits/atomic_lockfree_defines.h
-${CXXINCDIR}/bits/basic_ios.h
-${CXXINCDIR}/bits/basic_ios.tcc
-${CXXINCDIR}/bits/basic_string.h
-${CXXINCDIR}/bits/basic_string.tcc
-${CXXINCDIR}/bits/boost_concept_check.h
-${CXXINCDIR}/bits/c++0x_warning.h
-${CXXINCDIR}/bits/char_traits.h
-${CXXINCDIR}/bits/codecvt.h
-${CXXINCDIR}/bits/concept_check.h
-${CXXINCDIR}/bits/cpp_type_traits.h
-${CXXINCDIR}/bits/cxxabi_forced.h
-${CXXINCDIR}/bits/cxxabi_init_exception.h
-${CXXINCDIR}/bits/deque.tcc
-${CXXINCDIR}/bits/enable_special_members.h
-${CXXINCDIR}/bits/erase_if.h
-${CXXINCDIR}/bits/exception.h
-${CXXINCDIR}/bits/exception_defines.h
-${CXXINCDIR}/bits/exception_ptr.h
-${CXXINCDIR}/bits/forward_list.h
-${CXXINCDIR}/bits/forward_list.tcc
-${CXXINCDIR}/bits/fs_dir.h
-${CXXINCDIR}/bits/fs_fwd.h
-${CXXINCDIR}/bits/fs_ops.h
-${CXXINCDIR}/bits/fs_path.h
-${CXXINCDIR}/bits/fstream.tcc
-${CXXINCDIR}/bits/functexcept.h
-${CXXINCDIR}/bits/functional_hash.h
-${CXXINCDIR}/bits/gslice.h
-${CXXINCDIR}/bits/gslice_array.h
-${CXXINCDIR}/bits/hash_bytes.h
-${CXXINCDIR}/bits/hashtable.h
-${CXXINCDIR}/bits/hashtable_policy.h
-${CXXINCDIR}/bits/indirect_array.h
-${CXXINCDIR}/bits/invoke.h
-${CXXINCDIR}/bits/ios_base.h
-${CXXINCDIR}/bits/istream.tcc
-${CXXINCDIR}/bits/list.tcc
-${CXXINCDIR}/bits/locale_classes.h
-${CXXINCDIR}/bits/locale_classes.tcc
-${CXXINCDIR}/bits/locale_conv.h
-${CXXINCDIR}/bits/locale_facets.h
-${CXXINCDIR}/bits/locale_facets.tcc
-${CXXINCDIR}/bits/locale_facets_nonio.h
-${CXXINCDIR}/bits/locale_facets_nonio.tcc
-${CXXINCDIR}/bits/localefwd.h
-${CXXINCDIR}/bits/mask_array.h
-${CXXINCDIR}/bits/memoryfwd.h
-${CXXINCDIR}/bits/move.h
-${CXXINCDIR}/bits/nested_exception.h
-${CXXINCDIR}/bits/node_handle.h
-${CXXINCDIR}/bits/ostream.tcc
-${CXXINCDIR}/bits/ostream_insert.h
-${CXXINCDIR}/bits/parse_numbers.h
-${CXXINCDIR}/bits/postypes.h
-${CXXINCDIR}/bits/predefined_ops.h
-${CXXINCDIR}/bits/ptr_traits.h
-${CXXINCDIR}/bits/quoted_string.h
-${CXXINCDIR}/bits/random.h
-${CXXINCDIR}/bits/random.tcc
-${CXXINCDIR}/bits/range_access.h
-${CXXINCDIR}/bits/refwrap.h
-${CXXINCDIR}/bits/regex.h
-${CXXINCDIR}/bits/regex.tcc
-${CXXINCDIR}/bits/regex_automaton.h
-${CXXINCDIR}/bits/regex_automaton.tcc
-${CXXINCDIR}/bits/regex_compiler.h
-${CXXINCDIR}/bits/regex_compiler.tcc
-${CXXINCDIR}/bits/regex_constants.h
-${CXXINCDIR}/bits/regex_error.h
-${CXXINCDIR}/bits/regex_executor.h
-${CXXINCDIR}/bits/regex_executor.tcc
-${CXXINCDIR}/bits/regex_scanner.h
-${CXXINCDIR}/bits/regex_scanner.tcc
-${CXXINCDIR}/bits/shared_ptr.h
-${CXXINCDIR}/bits/shared_ptr_atomic.h
-${CXXINCDIR}/bits/shared_ptr_base.h
-${CXXINCDIR}/bits/slice_array.h
-${CXXINCDIR}/bits/specfun.h
-${CXXINCDIR}/bits/sstream.tcc
-${CXXINCDIR}/bits/std_abs.h
-${CXXINCDIR}/bits/std_function.h
-${CXXINCDIR}/bits/std_mutex.h
-${CXXINCDIR}/bits/stl_algo.h
-${CXXINCDIR}/bits/stl_algobase.h
-${CXXINCDIR}/bits/stl_bvector.h
-${CXXINCDIR}/bits/stl_construct.h
-${CXXINCDIR}/bits/stl_deque.h
-${CXXINCDIR}/bits/stl_function.h
-${CXXINCDIR}/bits/stl_heap.h
-${CXXINCDIR}/bits/stl_iterator.h
-${CXXINCDIR}/bits/stl_iterator_base_funcs.h
-${CXXINCDIR}/bits/stl_iterator_base_types.h
-${CXXINCDIR}/bits/stl_list.h
-${CXXINCDIR}/bits/stl_map.h
-${CXXINCDIR}/bits/stl_multimap.h
-${CXXINCDIR}/bits/stl_multiset.h
-${CXXINCDIR}/bits/stl_numeric.h
-${CXXINCDIR}/bits/stl_pair.h
-${CXXINCDIR}/bits/stl_queue.h
-${CXXINCDIR}/bits/stl_raw_storage_iter.h
-${CXXINCDIR}/bits/stl_relops.h
-${CXXINCDIR}/bits/stl_set.h
-${CXXINCDIR}/bits/stl_stack.h
-${CXXINCDIR}/bits/stl_tempbuf.h
-${CXXINCDIR}/bits/stl_tree.h
-${CXXINCDIR}/bits/stl_uninitialized.h
-${CXXINCDIR}/bits/stl_vector.h
-${CXXINCDIR}/bits/stream_iterator.h
-${CXXINCDIR}/bits/streambuf.tcc
-${CXXINCDIR}/bits/streambuf_iterator.h
-${CXXINCDIR}/bits/string_view.tcc
-${CXXINCDIR}/bits/stringfwd.h
-${CXXINCDIR}/bits/uniform_int_dist.h
-${CXXINCDIR}/bits/unique_lock.h
-${CXXINCDIR}/bits/unique_ptr.h
-${CXXINCDIR}/bits/unordered_map.h
-${CXXINCDIR}/bits/unordered_set.h
-${CXXINCDIR}/bits/uses_allocator.h
-${CXXINCDIR}/bits/valarray_after.h
-${CXXINCDIR}/bits/valarray_array.h
-${CXXINCDIR}/bits/valarray_array.tcc
-${CXXINCDIR}/bits/valarray_before.h
-${CXXINCDIR}/bits/vector.tcc
-${CXXINCDIR}/bitset
-${CXXINCDIR}/cassert
-${CXXINCDIR}/ccomplex
-${CXXINCDIR}/cctype
-${CXXINCDIR}/cerrno
-${CXXINCDIR}/cfenv
-${CXXINCDIR}/cfloat
-${CXXINCDIR}/charconv
-${CXXINCDIR}/chrono
-${CXXINCDIR}/cinttypes
-${CXXINCDIR}/ciso646
-${CXXINCDIR}/climits
-${CXXINCDIR}/clocale
-${CXXINCDIR}/cmath
-${CXXINCDIR}/codecvt
-${CXXINCDIR}/complex
-${CXXINCDIR}/complex.h
-${CXXINCDIR}/condition_variable
-${CXXINCDIR}/csetjmp
-${CXXINCDIR}/csignal
-${CXXINCDIR}/cstdalign
-${CXXINCDIR}/cstdarg
-${CXXINCDIR}/cstdbool
-${CXXINCDIR}/cstddef
-${CXXINCDIR}/cstdint
-${CXXINCDIR}/cstdio
-${CXXINCDIR}/cstdlib
-${CXXINCDIR}/cstring
-${CXXINCDIR}/ctgmath
-${CXXINCDIR}/ctime
-${CXXINCDIR}/cuchar
-${CXXINCDIR}/cwchar
-${CXXINCDIR}/cwctype
-${CXXINCDIR}/cxxabi.h
-${CXXINCDIR}/debug/array
-${CXXINCDIR}/debug/assertions.h
-${CXXINCDIR}/debug/bitset
-${CXXINCDIR}/debug/debug.h
-${CXXINCDIR}/debug/deque
-${CXXINCDIR}/debug/formatter.h
-${CXXINCDIR}/debug/forward_list
-${CXXINCDIR}/debug/functions.h
-${CXXINCDIR}/debug/helper_functions.h
-${CXXINCDIR}/debug/list
-${CXXINCDIR}/debug/macros.h
-${CXXINCDIR}/debug/map
-${CXXINCDIR}/debug/map.h
-${CXXINCDIR}/debug/multimap.h
-${CXXINCDIR}/debug/multiset.h
-${CXXINCDIR}/debug/safe_base.h
-${CXXINCDIR}/debug/safe_container.h
-${CXXINCDIR}/debug/safe_iterator.h
-${CXXINCDIR}/debug/safe_iterator.tcc
-${CXXINCDIR}/debug/safe_local_iterator.h
-${CXXINCDIR}/debug/safe_local_iterator.tcc
-${CXXINCDIR}/debug/safe_sequence.h
-${CXXINCDIR}/debug/safe_sequence.tcc
-${CXXINCDIR}/debug/safe_unordered_base.h
-${CXXINCDIR}/debug/safe_unordered_container.h
-${CXXINCDIR}/debug/safe_unordered_container.tcc
-${CXXINCDIR}/debug/set
-${CXXINCDIR}/debug/set.h
-${CXXINCDIR}/debug/stl_iterator.h
-${CXXINCDIR}/debug/string
-${CXXINCDIR}/debug/unordered_map
-${CXXINCDIR}/debug/unordered_set
-${CXXINCDIR}/debug/vector
-${CXXINCDIR}/decimal/decimal
-${CXXINCDIR}/decimal/decimal.h
-${CXXINCDIR}/deque
-${CXXINCDIR}/exception
-${CXXINCDIR}/execution
-${CXXINCDIR}/experimental/algorithm
-${CXXINCDIR}/experimental/any
-${CXXINCDIR}/experimental/array
-${CXXINCDIR}/experimental/bits/fs_dir.h
-${CXXINCDIR}/experimental/bits/fs_fwd.h
-${CXXINCDIR}/experimental/bits/fs_ops.h
-${CXXINCDIR}/experimental/bits/fs_path.h
-${CXXINCDIR}/experimental/bits/lfts_config.h
-${CXXINCDIR}/experimental/bits/net.h
-${CXXINCDIR}/experimental/bits/shared_ptr.h
Home |
Main Index |
Thread Index |
Old Index