Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

patched wine fails to compile loadorder.c #216

Open
luffare opened this issue May 14, 2016 · 5 comments
Open

patched wine fails to compile loadorder.c #216

luffare opened this issue May 14, 2016 · 5 comments

Comments

@luffare
Copy link

luffare commented May 14, 2016

Adding d3d9-patches breaks "make DESTDIR=/tmp/knasbubbla install"
Without d3d9-patches it works and i do use staging but after i patched with d3d9-patches it breaks.
If i don't use d3d9-patches everything works as expected.
wine_d3d9_install.txt
The patches are from https://github.com/NP-Hardass/wine-d3d9-patches.git and generated with "./generate-d3d9-patch.sh 1.9.9".

@xhebox
Copy link

xhebox commented May 14, 2016

package()
{
.....
        make prefix="$pkgdir/usr" install
.....
        make prefix="$pkgdir/usr" \
        libdir="$pkgdir/usr/lib32" \
        dlldir="$pkgdir/usr/lib32/wine" install
....
}

This is what wine-gaming-nine's PKGBUILD in aur looks like, maybe use 'prefix' to replace 'DESTDIR'? :)
You can check aur here: https://aur.archlinux.org/cgit/aur.git/tree/?h=wine-gaming-nine

EDIT: also this aur package is using a patched 1.99 version instead of generated patches, this can be a workaround

@luffare
Copy link
Author

luffare commented May 14, 2016

Using prefix instead doesn't make it work.

@siro20
Copy link

siro20 commented May 14, 2016

Please run make first, then run make install.
It fails to compile ntdll, as loadorder.c seems broken.

@luffare
Copy link
Author

luffare commented May 14, 2016

Your right it fails during make with d3d9 patches.
configure64-wine.log.txt
make64-wine.log.txt

-Wunused-but-set-parameter -Wvla -Wwrite-strings -Wpointer-arith -Wlogical-op -O2 -fPIC
../../../dlls/ntdll/loadorder.c:655:8: error: redefinition of 'get_redirect'
WCHAR* get_redirect( const WCHAR app_name, const WCHAR *path, BYTE *buffer, ULONG size )
^
../../../dlls/ntdll/loadorder.c:612:8: note: previous definition of 'get_redirect' was here
WCHAR
get_redirect( const WCHAR app_name, const WCHAR *path, BYTE *buffer, ULONG size )
^
Makefile:409: recipe for target 'loadorder.o' failed
make[1]: *
* [loadorder.o] Error 1
make[1]: Leaving directory '/tmp/build/tmp-wine/wine-1.9.9/wine64/dlls/ntdll'
Makefile:12406: recipe for target 'dlls/ntdll' failed
make: *** [dlls/ntdll] Error 2

@luffare luffare changed the title wine "make DESTDIR= install" error patched wine fails to compile loadorder.c May 15, 2016
@luffare
Copy link
Author

luffare commented May 15, 2016

I checked my logs and it seems as the generated d3d9 patches doesn't apply on top of staging.
patch-wine.log.txt
I guess generate-d3d9-patch.sh should have an option to create diff against staging as well.
I can't use pre-patched source in this build script.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

3 participants