Attachment #186191 for bug #221881

Lines 71-76 Link Here

(-)graphics/libdrm/Makefile (-1 / +7 lines)
71	pre-patch:	71	pre-patch:
72	@${REINPLACE_CMD} 's\|{libdir}/pkgconfig\|{prefix}/libdata/pkgconfig\|g; \	72	@${REINPLACE_CMD} 's\|{libdir}/pkgconfig\|{prefix}/libdata/pkgconfig\|g; \
73	s,i?86\|x86_64),i?86\|amd64\|x86_64),g' \	73	s,i?86\|x86_64),i?86\|amd64\|x86_64),g' \
74	${WRKSRC}/configure	74	${WRKSRC}/configure \
		75	${WRKSRC}/configure.ac
		76	@${REINPLACE_CMD} 's\|PKG_CHECK_MODULES.CUNIT.\|have_cunit=no\|g; \
		77	s\|AC_CHECK_LIB.cunit.\|\|g; \
		78	s\|test "x$${have_cunit}" = "xno"\|false\|g; \
		79	s\|test "x$$have_cunit" = "xno"\|false\|g' \
		80	${WRKSRC}/configure.ac
75		81
76	.include <bsd.port.mk>	82	.include <bsd.port.mk>




--- 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)
 




--- 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)
 

Return to bug 221881

Lines 1-13 Link Here

(-)graphics/libdrm/files/amdgpu_Makefile.am (-13 lines)
1	--- amdgpu/Makefile.am.orig 2017-07-19 09:37:32 UTC
2	+++ amdgpu/Makefile.am
3	@@ -31,8 +31,8 @@ AM_CFLAGS = \
4	-I$(top_srcdir)/include/drm
5
6	libdrmdatadir = @libdrmdatadir@
7	-ASIC_ID_TABLE_NUM_ENTRIES := $(shell egrep -ci '^[0-9a-f]{4},.*[0-9a-f]+,' \
8	- $(top_srcdir)/data/amdgpu.ids)
9	+ASIC_ID_TABLE_NUM_ENTRIES != egrep -ci '^[0-9a-f]{4},.*[0-9a-f]+,' \
10	+ $(top_srcdir)/data/amdgpu.ids
11	AM_CPPFLAGS = -DAMDGPU_ASIC_ID_TABLE=\"${libdrmdatadir}/amdgpu.ids\" \
12	-DAMDGPU_ASIC_ID_TABLE_NUM_ENTRIES=$(ASIC_ID_TABLE_NUM_ENTRIES)
13

Line 0 Link Here

(-)graphics/libdrm/files/patch-amdgpu_Makefile.am (+13 lines)
	1	--- amdgpu/Makefile.am.orig 2017-07-19 09:37:32 UTC
	2	+++ amdgpu/Makefile.am
	3	@@ -31,8 +31,8 @@ AM_CFLAGS = \
	4	-I$(top_srcdir)/include/drm
	5
	6	libdrmdatadir = @libdrmdatadir@
	7	-ASIC_ID_TABLE_NUM_ENTRIES := $(shell egrep -ci '^[0-9a-f]{4},.*[0-9a-f]+,' \
	8	- $(top_srcdir)/data/amdgpu.ids)
	9	+ASIC_ID_TABLE_NUM_ENTRIES != egrep -ci '^[0-9a-f]{4},.*[0-9a-f]+,' \
	10	+ $(top_srcdir)/data/amdgpu.ids
	11	AM_CPPFLAGS = -DAMDGPU_ASIC_ID_TABLE=\"${libdrmdatadir}/amdgpu.ids\" \
	12	-DAMDGPU_ASIC_ID_TABLE_NUM_ENTRIES=$(ASIC_ID_TABLE_NUM_ENTRIES)
	13