gentoo resync : 30.06.2019

1 files changed, 14 insertions, 0 deletions

diff --git a/profiles/prefix/windows/winnt/profile.bashrc b/profiles/prefix/windows/winnt/profile.bashrc
index 3c12c6519673..b8def6390deb 100644
--- a/profiles/prefix/windows/winnt/profile.bashrc
+++ b/profiles/prefix/windows/winnt/profile.bashrc
@@ -22,7 +22,9 @@ windows_setup_dllhelper() {
 		# But as there is another file to install (the real dll),
 		# and installation is done using cp, we override cp to
 		# additionally copy the dll when the library is copied.
+		ebegin "Setting up wrapper to copy the DLL along the LIB"
 		windows_setup_dllhelper_cp
+		eend $?
 		;;
 	esac
 }
@@ -60,6 +62,18 @@ post_src_install() {
 			;;
 		esac
 	done
+	[[ -d usr/$(get_libdir) ]] &&
+	find usr/$(get_libdir) -maxdepth 1 -type f -name '*.dll' |
+	while read f
+	do
+		if test ! -f usr/bin/${f##*/}; then
+			ebegin "moving ${f} to usr/bin for native loader"
+			dodir usr/bin || die
+			mv -f "${f}" usr/bin || die
+			ln -sf "../bin/${f##*/}" "${f}" || die
+			eend $?
+		fi
+	done
 }
 
 windows_setup_dllhelper_cp() {