Attachment 186191 Details for Bug 221881 – Force-disable cunit, rename amdgpu_Makefile.am -> patch-amdgpu_Makefile.am

[patch] Force-disable cunit, rename amdgpu_Makefile.am -> patch-amdgpu_Makefile.am

libdrm.patch (text/plain), 2.22 KB, created by Ivan Rozhuk on 2017-09-09 09:37:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Rozhuk

Created: 2017-09-09 09:37:14 UTC

Size: 2.22 KB

patch

obsolete

>Index: graphics/libdrm/Makefile
>===================================================================
>--- graphics/libdrm/Makefile	(revision 449481)
>+++ graphics/libdrm/Makefile	(working copy)
>@@ -71,6 +71,12 @@
> pre-patch:
> 	@${REINPLACE_CMD} 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g; \
> 			   s,i?86|x86_64),i?86|amd64|x86_64),g' \
>-		${WRKSRC}/configure
>+		${WRKSRC}/configure \
>+		${WRKSRC}/configure.ac
>+	@${REINPLACE_CMD} 's|PKG_CHECK_MODULES.*CUNIT.*|have_cunit=no|g; \
>+			   s|AC_CHECK_LIB.*cunit.*||g; \
>+			   s|test "x$${have_cunit}" = "xno"|false|g; \
>+			   s|test "x$$have_cunit" = "xno"|false|g' \
>+		${WRKSRC}/configure.ac
> 
> .include <bsd.port.mk>
>Index: graphics/libdrm/files/amdgpu_Makefile.am
>===================================================================
>--- graphics/libdrm/files/amdgpu_Makefile.am	(revision 449481)
>+++ graphics/libdrm/files/amdgpu_Makefile.am	(nonexistent)
>@@ -1,13 +0,0 @@
>---- amdgpu/Makefile.am.orig	2017-07-19 09:37:32 UTC
>-+++ amdgpu/Makefile.am
>-@@ -31,8 +31,8 @@ AM_CFLAGS = \
>- 	-I$(top_srcdir)/include/drm
>- 
>- libdrmdatadir = @libdrmdatadir@
>--ASIC_ID_TABLE_NUM_ENTRIES := $(shell egrep -ci '^[0-9a-f]{4},.*[0-9a-f]+,' \
>--	$(top_srcdir)/data/amdgpu.ids)
>-+ASIC_ID_TABLE_NUM_ENTRIES != egrep -ci '^[0-9a-f]{4},.*[0-9a-f]+,' \
>-+	$(top_srcdir)/data/amdgpu.ids
>- AM_CPPFLAGS = -DAMDGPU_ASIC_ID_TABLE=\"${libdrmdatadir}/amdgpu.ids\" \
>- 	-DAMDGPU_ASIC_ID_TABLE_NUM_ENTRIES=$(ASIC_ID_TABLE_NUM_ENTRIES)
>- 
>Index: graphics/libdrm/files/patch-amdgpu_Makefile.am
>===================================================================
>--- graphics/libdrm/files/patch-amdgpu_Makefile.am	(nonexistent)
>+++ graphics/libdrm/files/patch-amdgpu_Makefile.am	(working copy)
>@@ -0,0 +1,13 @@
>+--- amdgpu/Makefile.am.orig	2017-07-19 09:37:32 UTC
>++++ amdgpu/Makefile.am
>+@@ -31,8 +31,8 @@ AM_CFLAGS = \
>+ 	-I$(top_srcdir)/include/drm
>+ 
>+ libdrmdatadir = @libdrmdatadir@
>+-ASIC_ID_TABLE_NUM_ENTRIES := $(shell egrep -ci '^[0-9a-f]{4},.*[0-9a-f]+,' \
>+-	$(top_srcdir)/data/amdgpu.ids)
>++ASIC_ID_TABLE_NUM_ENTRIES != egrep -ci '^[0-9a-f]{4},.*[0-9a-f]+,' \
>++	$(top_srcdir)/data/amdgpu.ids
>+ AM_CPPFLAGS = -DAMDGPU_ASIC_ID_TABLE=\"${libdrmdatadir}/amdgpu.ids\" \
>+ 	-DAMDGPU_ASIC_ID_TABLE_NUM_ENTRIES=$(ASIC_ID_TABLE_NUM_ENTRIES)
>+

Actions: View | Diff

Attachments on bug 221881: 185919 | 185926 | 186191