Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 433161
Collapse All | Expand All

(-)toolchain.eclass.orig (-1 / +26 lines)
Lines 23-29 Link Here
23
	inherit git-2
23
	inherit git-2
24
fi
24
fi
25
25
26
EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_test src_install pkg_postinst pkg_postrm
26
EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_test src_install pkg_preinst pkg_postinst pkg_prerm pkg_postrm
27
DESCRIPTION="The GNU Compiler Collection"
27
DESCRIPTION="The GNU Compiler Collection"
28
28
29
FEATURES=${FEATURES/multilib-strict/}
29
FEATURES=${FEATURES/multilib-strict/}
Lines 570-579 Link Here
570
	unset LANGUAGES #265283
570
	unset LANGUAGES #265283
571
}
571
}
572
572
573
toolchain_pkg_preinst() {
574
	if ! is_crosscompile ; then
575
		# Temporarily add the the new path directly to the linker search paths
576
		# to be sure the new libgcc_s.so will be found after the old one got removed.
577
		# This has to be done because pkg_postinst (and thus gcc_config) is called
578
		# only after the old (current) libgcc_s.so was removed, which would leave
579
		# the system without any libgcc_s.so which is necessary for gcc_config.
580
		# See bug #437050
581
		echo "${PREFIX}/lib/gcc/${CTARGET}/${GCC_CONFIG_VER}" > "/etc/ld.so.conf.d/00_toolchain_eclass_tmp_${PF}.conf"
582
	fi
583
}
584
573
toolchain_pkg_postinst() {
585
toolchain_pkg_postinst() {
574
	do_gcc_config
586
	do_gcc_config
575
587
576
	if ! is_crosscompile ; then
588
	if ! is_crosscompile ; then
589
		# gcc_config was called so the new libgcc_s.so can be found without the temporary.
590
		# See bug #437050
591
		rm "/etc/ld.so.conf.d/00_toolchain_eclass_tmp_${PF}.conf" # remove temporary file
592
		ldconfig # update the dynamic linker search paths
593
	fi
594
595
	if ! is_crosscompile ; then
577
		echo
596
		echo
578
		ewarn "If you have issues with packages unable to locate libstdc++.la,"
597
		ewarn "If you have issues with packages unable to locate libstdc++.la,"
579
		ewarn "then try running 'fix_libtool_files.sh' on the old gcc versions."
598
		ewarn "then try running 'fix_libtool_files.sh' on the old gcc versions."
Lines 601-606 Link Here
601
	fi
620
	fi
602
}
621
}
603
622
623
toolchain_pkg_prerm() {
624
	if ! is_crosscompile ; then
625
		ldconfig # update the dynamic linker search paths
626
	fi
627
}
628
604
toolchain_pkg_postrm() {
629
toolchain_pkg_postrm() {
605
	# to make our lives easier (and saner), we do the fix_libtool stuff here.
630
	# to make our lives easier (and saner), we do the fix_libtool stuff here.
606
	# rather than checking SLOT's and trying in upgrade paths, we just see if
631
	# rather than checking SLOT's and trying in upgrade paths, we just see if

Return to bug 433161