Resolve packing issue on Linux & FreeBSD.

Add a new PLIST_VAR which covers the additions related to libc++.

2 files changed, 22 insertions, 2 deletions

diff --git a/cross/arm-none-eabi-gcc/Makefile b/cross/arm-none-eabi-gcc/Makefile
index 08ccade06f8..15853129e51 100644
--- a/cross/arm-none-eabi-gcc/Makefile
+++ b/cross/arm-none-eabi-gcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2017/08/16 14:41:12 ryoon Exp $
+# $NetBSD: Makefile,v 1.7 2017/08/31 19:55:19 sevan Exp $
 
 DISTNAME=		gcc-7.2.0
 PKGNAME=		cross-arm-none-eabi-${DISTNAME}
@@ -49,6 +49,8 @@ INFO_FILES=		yes
 
 CONFIGURE_ARGS+=	--enable-${PLUGIN_NAME}-plugin
 
+PLIST_VARS+= 		libcpp
+
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mclang)
 # geattrtab on neon.md results in a very deeply nested expression
@@ -57,6 +59,10 @@ CONFIGURE_ARGS+=	--enable-${PLUGIN_NAME}-plugin
 CFLAGS+=	-fbracket-depth=1024
 .endif
 
+.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux"
+PLIST.libcpp= 		yes
+.endif
+
 post-extract:
 	${LN} -s ${WRKDIR}/newlib-${NEWLIBVER}/newlib ${WRKSRC}/newlib
 	${LN} -s ${WRKDIR}/newlib-${NEWLIBVER}/libgloss ${WRKSRC}/libgloss
diff --git a/cross/arm-none-eabi-gcc/PLIST b/cross/arm-none-eabi-gcc/PLIST
index f1dfdb7b0ba..cb0efab47dd 100644
--- a/cross/arm-none-eabi-gcc/PLIST
+++ b/cross/arm-none-eabi-gcc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2017/08/16 14:41:12 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.5 2017/08/31 19:55:19 sevan Exp $
 cross-arm-none-eabi/arm-none-eabi/include/_ansi.h
 cross-arm-none-eabi/arm-none-eabi/include/_newlib_version.h
 cross-arm-none-eabi/arm-none-eabi/include/_syslist.h
@@ -375,6 +375,7 @@ cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/bin
 cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/binomial_heap_/constructors_destructor_fn_imps.hpp
 cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/binomial_heap_/debug_fn_imps.hpp
 cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/binomial_heap_base_/binomial_heap_base_.hpp
+${PLIST.libcpp}cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/binomial_heap_base_/constructors_destructor_fn_imps.hpp
 cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/binomial_heap_base_/debug_fn_imps.hpp
 cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/binomial_heap_base_/erase_fn_imps.hpp
 cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/binomial_heap_base_/find_fn_imps.hpp
@@ -386,6 +387,9 @@ cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/bra
 cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/cc_hash_table_map_/cc_ht_map_.hpp
 cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/cc_hash_table_map_/cmp_fn_imps.hpp
 cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/cc_hash_table_map_/cond_key_dtor_entry_dealtor.hpp
+${PLIST.libcpp}cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_fn_imps.hpp
+${PLIST.libcpp}cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp
+${PLIST.libcpp}cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_store_hash_fn_imps.hpp
 cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/cc_hash_table_map_/debug_fn_imps.hpp
 cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/cc_hash_table_map_/debug_no_store_hash_fn_imps.hpp
 cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/cc_hash_table_map_/debug_store_hash_fn_imps.hpp
@@ -411,6 +415,9 @@ cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/con
 cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/debug_map_base.hpp
 cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/eq_fn/eq_by_less.hpp
 cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/eq_fn/hash_eq_fn.hpp
+${PLIST.libcpp}cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_fn_imps.hpp
+${PLIST.libcpp}cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp
+${PLIST.libcpp}cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_store_hash_fn_imps.hpp
 cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/gp_hash_table_map_/debug_fn_imps.hpp
 cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/gp_hash_table_map_/debug_no_store_hash_fn_imps.hpp
 cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/gp_hash_table_map_/debug_store_hash_fn_imps.hpp
@@ -445,12 +452,16 @@ cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/has
 cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/hash_fn/sample_ranged_hash_fn.hpp
 cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/hash_fn/sample_ranged_probe_fn.hpp
 cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/left_child_next_sibling_heap_/const_iterator.hpp
+${PLIST.libcpp}cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/left_child_next_sibling_heap_/constructors_destructor_fn_imps.hpp
 cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/left_child_next_sibling_heap_/debug_fn_imps.hpp
 cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/left_child_next_sibling_heap_/erase_fn_imps.hpp
 cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/left_child_next_sibling_heap_/info_fn_imps.hpp
 cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/left_child_next_sibling_heap_/insert_fn_imps.hpp
 cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/left_child_next_sibling_heap_/iterators_fn_imps.hpp
+${PLIST.libcpp}cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/left_child_next_sibling_heap_/left_child_next_sibling_heap_.hpp
 cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/left_child_next_sibling_heap_/node.hpp
+${PLIST.libcpp}cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/left_child_next_sibling_heap_/point_const_iterator.hpp
+${PLIST.libcpp}cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/left_child_next_sibling_heap_/policy_access_fn_imps.hpp
 cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/left_child_next_sibling_heap_/trace_fn_imps.hpp
 cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/list_update_map_/constructor_destructor_fn_imps.hpp
 cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/list_update_map_/debug_fn_imps.hpp
@@ -510,6 +521,7 @@ cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/rb_
 cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/rb_tree_map_/rb_tree_.hpp
 cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/rb_tree_map_/split_join_fn_imps.hpp
 cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/rb_tree_map_/traits.hpp
+${PLIST.libcpp}cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/rc_binomial_heap_/constructors_destructor_fn_imps.hpp
 cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/rc_binomial_heap_/debug_fn_imps.hpp
 cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/rc_binomial_heap_/erase_fn_imps.hpp
 cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/rc_binomial_heap_/insert_fn_imps.hpp
@@ -517,8 +529,10 @@ cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/rc_
 cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/rc_binomial_heap_/rc_binomial_heap_.hpp
 cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/rc_binomial_heap_/split_join_fn_imps.hpp
 cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/rc_binomial_heap_/trace_fn_imps.hpp
+${PLIST.libcpp}cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/resize_policy/cc_hash_max_collision_check_resize_trigger_imp.hpp
 cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/resize_policy/hash_exponential_size_policy_imp.hpp
 cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_imp.hpp
+${PLIST.libcpp}cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_size_base.hpp
 cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/resize_policy/hash_prime_size_policy_imp.hpp
 cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/resize_policy/hash_standard_resize_policy_imp.hpp
 cross-arm-none-eabi/arm-none-eabi/include/c++/${PKGVERSION}/ext/pb_ds/detail/resize_policy/sample_resize_policy.hpp