diff options
| author | Treeve Jelbert | 2020-06-26 14:49:43 +0200 |
|---|---|---|
| committer | Treeve Jelbert | 2020-06-26 14:49:43 +0200 |
| commit | c924795ce73cea44a91c96be55512bd13442102c (patch) | |
| tree | 6e64bf1de83de6d642c01e058697272097fcdabc /xorg-driver | |
| parent | a3eea0e10c126feb254992691f43fde372c3c1ad (diff) | |
xf86-video-amdgpu - fix build with gcc-10
Diffstat (limited to 'xorg-driver')
| -rw-r--r-- | xorg-driver/xf86-video-amdgpu/HISTORY | 3 | ||||
| -rwxr-xr-x | xorg-driver/xf86-video-amdgpu/PRE_BUILD | 3 | ||||
| -rw-r--r-- | xorg-driver/xf86-video-amdgpu/patches/gcc.patch | 23 |
3 files changed, 29 insertions, 0 deletions
diff --git a/xorg-driver/xf86-video-amdgpu/HISTORY b/xorg-driver/xf86-video-amdgpu/HISTORY index 62df74bd94..9331fe70a5 100644 --- a/xorg-driver/xf86-video-amdgpu/HISTORY +++ b/xorg-driver/xf86-video-amdgpu/HISTORY @@ -1,3 +1,6 @@ +2020-06-26Treeve Jelbert <treeve@sourcemage.org> + PRE-BUILD patches/*: added, fix build with gcc10 + 2019-10-11 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 19.1.0 diff --git a/xorg-driver/xf86-video-amdgpu/PRE_BUILD b/xorg-driver/xf86-video-amdgpu/PRE_BUILD new file mode 100755 index 0000000000..922c0ab256 --- /dev/null +++ b/xorg-driver/xf86-video-amdgpu/PRE_BUILD @@ -0,0 +1,3 @@ +default_pre_build && +cd $SOURCE_DIRECTORY && +apply_patch_dir patches diff --git a/xorg-driver/xf86-video-amdgpu/patches/gcc.patch b/xorg-driver/xf86-video-amdgpu/patches/gcc.patch new file mode 100644 index 0000000000..9062c9b2ae --- /dev/null +++ b/xorg-driver/xf86-video-amdgpu/patches/gcc.patch @@ -0,0 +1,23 @@ +commit edcbe5f52ddfceee3d66d69bbcebbceac06b6d0d +Author: Adam Jackson <ajax@redhat.com> +Date: Tue Feb 4 16:38:06 2020 -0500 + + Fix link failure with gcc 10 + + Without the 'extern' this looks like a definition not just a + declaration, in every file that includes the header. gcc 10 is stricter + about this kind of multiple definition. + +diff --git a/src/drmmode_display.h b/src/drmmode_display.h +index 803ac3c..9c0f25a 100644 +--- a/src/drmmode_display.h ++++ b/src/drmmode_display.h +@@ -289,7 +289,7 @@ Bool drmmode_wait_vblank(xf86CrtcPtr crtc, drmVBlankSeqType type, + uint64_t *ust, uint32_t *result_seq); + + +-miPointerSpriteFuncRec drmmode_sprite_funcs; ++extern miPointerSpriteFuncRec drmmode_sprite_funcs; + + + #endif |