Frogging-Family / wine-tkg-git

The wine-tkg build systems, to create custom Wine and Proton builds
893 stars 163 forks source link

-NO32LIBS = true - Doesn't work anymore apparently, 32-bit build will fail on Pop!_Os thanks to this #1019

Closed gabriele2000 closed 1 year ago

gabriele2000 commented 1 year ago

FIX: I'm stupid, I've been setting "default-tkg" as profile instead of nothing, overriding my customization.

I'm trying to build wine-staging-8.+ and I've done it a week ago, now I wanted to do another build with different options and this option doesn't work anymore, 32-bit build will start even if it shouldn't.

Options:

_nomakepkg_prefix_path=""
_nomakepkg_nover="true"
_nomakepkg_midbuild_prompt="false"
_nomakepkg_dep_resolution_distro=""

_staging_version=""

_LOCAL_PRESET="default-tkg"
_PKGNAME_OVERRIDE="none"

CUSTOM_MINGW_PATH=""
CUSTOM_GCC_PATH=""

_GCC_FLAGS="-O3 -march=native -mtune=native -pipe"

_CROSS_FLAGS="-O3 -march=native -mtune=native -pipe"

_pkg_strip="true"
_NUKR="true"
_NOLIB32="true"
_NOLIB64="false"

_prefer_external_faudio="true"
_nopatchmsg="false"

#### WINE FLAVOUR SETTINGS ####

_configure_userargs64="--with-gstreamer --without-ldap --without-oss --disable-winemenubuilder"

_use_esync="false"
_use_fsync="true"
_fsync_spincounts="false"

_use_vkd3dlib="false"
_dxvk_dxgi="true"

#### GAME-SPECIFIC PATCHES ####

_proton_battleye_support="true"
_proton_eac_support="true"
_childwindow_fix="true"
_mk11_fix="false"

#### OTHER PATCHES ####

_GLSL_toggle="true"
_MIME_NOPE="true"
_FOAS_NOPE="true"
_stg_shared_mem_default="true"
_use_josh_flat_theme="true"

#### PROTON PATCHES ####

_sdl_joy_support="true"
_FS_bypass_compositor="true"
_proton_fs_hack="true"
_proton_rawinput="true"
_msvcrt_nativebuiltin="false"
_large_address_aware="true"
_protonify="true"

# Disable those patches
_use_pba="false"
_sims2_fix="false"
_server_send_hwmsg_disable="false"
_poe_fix="false"
_warframelauncher_fix="false"
_OW_fix="false"
_318python_fix="false"
_f4skyrimse_fix="false"
_steam_fix="false"
_highcorecount_fix="false"
_c6b6935_revert="false"
_nativedotnet_fix="false"
_usvfs_fix="false"
_use_faudio="false"
_kernelbase_reverts="false"
_update_winevulkan="false"
_fake_refresh_rate=""
_mtga_fix="false"
_plasma_systray_fix="false"
_fsync_legacy="false"
_fsync_futex2="false"
_clock_monotonic="false"

#### USER PATCHES - See README in ./wine-tkg-userpatches dir for instructions ####

_community_patches=""
TheComputerGuy96 commented 1 year ago

@gabriele2000 Enabling _NOLIB32 will enable the new-style WoW64 support on newer Wine versions thanks to a configure argument being added in the wine-tkg build script

TheComputerGuy96 commented 1 year ago

Here's the line that does this: https://github.com/Frogging-Family/wine-tkg-git/blob/9b0af1dfb4ed66b43713b48d0d19f4cd8eb2b722/wine-tkg-git/wine-tkg-scripts/build-64.sh#L31

gabriele2000 commented 1 year ago

@gabriele2000 Enabling _NOLIB32 will enable the new-style WoW64 support on newer Wine versions thanks to a configure argument being added in the wine-tkg build script

Yeah, I know that, but it's weird that now I can't compile WINE anymore because it asks for dependencies that apparently I don't have... remember that I've built wine 6.9 last week.

I'll try satisfying the dependencies but I'm trying to do this for all day, weird.

TheComputerGuy96 commented 1 year ago

@gabriele2000 For now you can replace the line I showed with --enable-win64

gabriele2000 commented 1 year ago

@gabriele2000 For now you can replace the line I showed with --enable-win64

So is that line bugged? I remember that this afternoon I managed to get one build compiled and it had all 32-bit unix libs. That wasn't right.

Since we're at it, --without-vkd3d is not recognized anymore

TheComputerGuy96 commented 1 year ago

@gabriele2000 That line instructs Wine to build both 32-bit and 64-bit parts but in a special WoW64 way (without any 32-bit Unix libraries)

gabriele2000 commented 1 year ago

@gabriele2000 That line instructs Wine to build both 32-bit and 64-bit parts but in a special WoW64 way (without any 32-bit Unix libraries)

I'm stupid, I've been setting "default-tkg" as profile instead of nothing, overriding my customization.

Apparently it's not working, since it builds everything... weird.

I deleted everything and cloned everything back, to no avail.

image You see? It should be /lib with 4 folders:

EDIT: @TheComputerGuy96 maybe https://gitlab.winehq.org/wine/wine/-/commit/00538ed195b78a73a7fe4aebdf7dd4577d954dbc# is the responsible.

UPDATE: I really don't understand this... I SWEAR, I've compiled a version when there were three folders: /bin /lib /share Like this: image

Then inside /lib/wine image

This is, of course, wine-tkg-7.20, built by Kron4ek.

Mine was the same, except for the fact that one folder was EMPTY, but HOW IS THIS NOT POSSIBLE ANYMORE?

I need sleep...

Tk-Glitch commented 1 year ago

I have restored the old behavior, and added a wow64 path https://github.com/Frogging-Family/wine-tkg-git/commit/96d0bfd61ccdc213b61e187f38ed19385fbf8528