3 files changed, 13 insertions, 18 deletions
diff --git a/emulators/wine-devel/files/patch-configure b/emulators/wine-devel/files/patch-configure
deleted file mode 100644
index 1b505cb0fd84..000000000000
--- a/emulators/wine-devel/files/patch-configure
+++ /dev/null
@@ -1,12 +0,0 @@
---- UTC
---- configure.orig	2024-08-10 14:38:54.000000000 +0000
-+++ configure	2024-08-10 23:43:05.264405000 +0000
-@@ -10662,7 +10662,7 @@
-     llvm_extra_ldflags=""
-     llvm_cflags=""
-     case $llvm_target in
--      *windows) llvm_cflags="-Wl,-subsystem:console -Wl,-WX" ;;
-+      *windows) llvm_cflags="-Wl,-subsystem:console" ;;
-     esac
-     { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_$llvm_extra_cflags $llvm_cflags --no-default-config" | $as_tr_sh`
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports $llvm_extra_cflags $llvm_cflags --no-default-config" >&5
diff --git a/emulators/wine-devel/files/pkg32.sh b/emulators/wine-devel/files/pkg32.sh
index 64d82459c219..04595f6c104c 100644
--- a/emulators/wine-devel/files/pkg32.sh
+++ b/emulators/wine-devel/files/pkg32.sh
@@ -1,19 +1,23 @@
 #!/bin/sh -e
 
-if [ "$(id -u)" = 0 ]
-then
+if [ "$(id -u)" = 0 ]; then
   echo "Don't run this script as root!"
   exit 1
 fi
 
 I386_ROOT="${WINE_i386_ROOT:-$HOME/.i386-wine-pkg}"
+ABI_FILE=/usr/lib32/libc.so.7
 
-if [ ! -d "$I386_ROOT/usr/share/keys/pkg" ]
-then
+if [ ! -f $ABI_FILE ]; then
+  echo "\"$ABI_FILE\" not found; exiting."
+  exit 1
+fi
+
+if [ ! -d "$I386_ROOT/usr/share/keys/pkg" ]; then
   mkdir -p "$I386_ROOT/usr/share/keys"
   ln -s /usr/share/keys/pkg "$I386_ROOT/usr/share/keys/pkg"
 fi
 
 # Show what we're going to do, then do it.
-echo pkg -o ABI_FILE=/usr/lib32/libc.so.7 -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@"
-exec pkg -o ABI_FILE=/usr/lib32/libc.so.7 -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@"
+echo pkg -o ABI_FILE=$ABI_FILE -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@"
+exec pkg -o ABI_FILE=$ABI_FILE -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@"
diff --git a/emulators/wine-devel/files/wine-wow64.sh b/emulators/wine-devel/files/wine-wow64.sh
index fd96577fb486..47d8fcc90f2c 100644
--- a/emulators/wine-devel/files/wine-wow64.sh
+++ b/emulators/wine-devel/files/wine-wow64.sh
@@ -23,6 +23,9 @@ HERE
   exit 1
 fi
 
+# Export early so that external libs could be found
+export LD_32_LIBRARY_PATH="${LD_32_LIBRARY_PATH:+$LD_32_LIBRARY_PATH:}$I386_ROOT/$LOCALBASE/lib"
+
 WINE32_VERSION=$(env -u WINELOADERNOEXEC "$I386_ROOT/$PREFIX/bin/wine" --version)
 WINE64_VERSION=$(env -u WINELOADERNOEXEC "${TARGET}64" --version)
 if [ "$WINE32_VERSION" != "$WINE64_VERSION" ]