diff options
| author | Ismael Luceno | 2022-01-19 16:49:46 +0100 |
|---|---|---|
| committer | Ismael Luceno | 2022-01-19 23:32:39 +0100 |
| commit | 2d86269b5880c1e5bed97645c04bcba706e3fea0 (patch) | |
| tree | a7a782249677cbed1e13c13e449beeb68d9429db /x11-libs | |
| parent | a9277a4e37045a77875902b3fedf8c387ba484b4 (diff) | |
wine: Add rpath to libraries, fixes run-time linking issue
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/wine/HISTORY | 1 | ||||
| -rw-r--r-- | x11-libs/wine/patches/rpath.patch | 59 |
2 files changed, 60 insertions, 0 deletions
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY index ec429d58e8..bba65015a6 100644 --- a/x11-libs/wine/HISTORY +++ b/x11-libs/wine/HISTORY @@ -1,5 +1,6 @@ 2022-01-19 Ismael Luceno <ismael@sourcemage.org> * DETAILS: updated to 7.0 + * patches/rpath.patch: added patch for run-time linking issues 2021-12-06 Ismael Luceno <ismael@sourcemage.org> * DETAILS: updated (devel) to 6.23 diff --git a/x11-libs/wine/patches/rpath.patch b/x11-libs/wine/patches/rpath.patch new file mode 100644 index 0000000000..515a1f045b --- /dev/null +++ b/x11-libs/wine/patches/rpath.patch @@ -0,0 +1,59 @@ +Origin: Alpine Linux + +diff --git a/configure b/configure +index 774a95ce003..d408e77cc78 100755 +--- a/configure ++++ b/configure +@@ -11137,6 +11137,38 @@ fi + LIBWINE_DEPENDS="wine.map" + + TOP_INSTALL_LIB="$TOP_INSTALL_LIB libs/wine/libwine.so.$libwine_version libs/wine/libwine.so.$libwine_soversion" ++ ++ # do this at the end because it needs double dollar for makefile ++ as_ac_var=`printf "%s\n" "ac_cv_cflags_-Wl,-rpath,\\\\\\$ORIGIN" | $as_tr_sh` ++{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-rpath,\\\$ORIGIN" >&5 ++printf %s "checking whether the compiler supports -Wl,-rpath,\\\$ORIGIN... " >&6; } ++if eval test \${$as_ac_var+y} ++then : ++ printf %s "(cached) " >&6 ++else $as_nop ++ ac_wine_try_cflags_saved=$CFLAGS ++CFLAGS="$CFLAGS -Wl,-rpath,\\\$ORIGIN" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++int main(int argc, char **argv) { return 0; } ++_ACEOF ++if ac_fn_c_try_link "$LINENO" ++then : ++ eval "$as_ac_var=yes" ++else $as_nop ++ eval "$as_ac_var=no" ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.beam \ ++ conftest$ac_exeext conftest.$ac_ext ++CFLAGS=$ac_wine_try_cflags_saved ++fi ++eval ac_res=\$$as_ac_var ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++printf "%s\n" "$ac_res" >&6; } ++if eval test \"x\$"$as_ac_var"\" = x"yes" ++then : ++ UNIXLDFLAGS="$UNIXLDFLAGS '-Wl,-rpath,\$\$ORIGIN'" ++fi + ;; + esac + +diff --git a/configure.ac b/configure.ac +index 8c5066a3de6..01ede86df1e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -916,6 +916,9 @@ case $host_os in + AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so.$libwine_version") + AC_SUBST(LIBWINE_DEPENDS,"wine.map") + TOP_INSTALL_LIB="$TOP_INSTALL_LIB libs/wine/libwine.so.$libwine_version libs/wine/libwine.so.$libwine_soversion" ++ ++ # do this at the end because it needs double dollar for makefile ++ WINE_TRY_CFLAGS([-Wl,-rpath,\\\$ORIGIN],[UNIXLDFLAGS="$UNIXLDFLAGS '-Wl,-rpath,\$\$ORIGIN'"]) + ;; + esac + |