alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
nixpkgs/pkgs/applications/editors/aseprite/allegro-glibc-2.30.patch

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

9 lines
292 B
Diff
Raw Normal View History

aseprite: fix build with glibc 2.30 Otherwise it fails with: In file included from /build/source/src/allegro/include/allegro/base.h:41, from /build/source/src/allegro/include/allegro.h:25, from /build/source/src/./she/alleg4/alleg_surface.h:11, from /build/source/src/she/alleg4/alleg_surface.cpp:11: /build/source/src/allegro/include/allegro/alcompat.h:44:22: error: conflicting declaration of C function 'fixed fadd(fixed, fixed)' 44 | AL_ALIAS(fixed fadd(fixed x, fixed y), fixadd(x, y)) | ^~~~ /build/source/src/allegro/include/allegro/internal/alconfig.h:164:49: note: in definition of macro 'AL_ALIAS' 164 | static __attribute__((unused)) __inline__ DECL \ | ^~~~ In file included from /nix/store/y57skwl8a5vbkrjrc30ygdw9vr1p6n19-gcc-9.2.0/include/c++/9.2.0/cmath:45, from /nix/store/y57skwl8a5vbkrjrc30ygdw9vr1p6n19-gcc-9.2.0/include/c++/9.2.0/math.h:36, from /build/source/src/./base/base.h:13, from /build/source/src/./config.h:40, from /build/source/src/she/alleg4/alleg_surface.cpp:8: /nix/store/2v6pi2wj3lcsc3j48n7flx9mgqyii1lv-glibc-2.30-dev/include/bits/mathcalls-narrow.h:24:20: note: previous declaration 'float fadd(double, double)' 24 | __MATHCALL_NARROW (__MATHCALL_NAME (add), __MATHCALL_REDIR_NAME (add), 2); | ^~~~~~~~~~~~~~~
2020-02-18 06:05:09 +00:00
diff --git a/src/she/CMakeLists.txt b/src/she/CMakeLists.txt
index 4909ff1..02fa145 100644
--- a/src/she/CMakeLists.txt
+++ b/src/she/CMakeLists.txt
@@ -23,2 +23,3 @@ if(USE_ALLEG4_BACKEND)
add_definitions(-DUSE_MOUSE_POLLER)
+ add_definitions(-DALLEGRO_NO_FIX_ALIASES)
endif()
Copy permalink