Attachment #200866 for bug #233018

Lines 12-28 Link Here

(-)Makefile (-4 / +9 lines)
12		12
13	LICENSE= BSD2CLAUSE	13	LICENSE= BSD2CLAUSE
14		14
		15	ONLY_FOR_ARCHS= amd64 i386
		16
15	BUILD_DEPENDS= gawk:lang/gawk	17	BUILD_DEPENDS= gawk:lang/gawk
		18	LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
		19	libfreetype.so:print/freetype2
16		20
17	USES= tar:bzip2 kmod pkgconfig	21	USES= gnome tar:bzip2 kmod pkgconfig
		22	USE_GNOME= gtk20 cairo gdkpixbuf2
		23	USE_RC_SUBR= oss
		24
18	HAS_CONFIGURE= yes	25	HAS_CONFIGURE= yes
19	CONFIGURE_OUTSOURCE= yes	26	CONFIGURE_OUTSOURCE= yes
20	CONFIGURE_ENV= HOSTCC="${CC}"	27	CONFIGURE_ENV= HOSTCC="${CC}"
21	ALL_TARGET= all install	28	ALL_TARGET= all install
22	USE_GNOME= gtk20	29
23	USE_RC_SUBR= oss
24	SUB_FILES= pkg-install pkg-deinstall	30	SUB_FILES= pkg-install pkg-deinstall
25	ONLY_FOR_ARCHS= amd64 i386
26	LLD_UNSAFE= yes	31	LLD_UNSAFE= yes
27		32
28	KMODDIR= ${PREFIX}/lib/oss/modules	33	KMODDIR= ${PREFIX}/lib/oss/modules




--- kernel/OS/FreeBSD/wrapper/bsddefs.h.orig	2019-01-06 18:38:02 UTC
+++ kernel/OS/FreeBSD/wrapper/bsddefs.h
@@ -91,7 +91,10 @@ typedef int ddi_iblock_cookie_t;
 extern void oss_udelay (unsigned long t);
 
 #ifdef _KERNEL
+#ifdef memset
+#undef memset
 #define memset oss_memset
+#endif
 extern void *oss_memset (void *t, int val, int l);
 #endif
 

Lines 5-10 Link Here

(-)files/patch-setup_srcconf__freebsd.inc (-1 / +1 lines)
5	# if defined(__x86_64__)	5	# if defined(__x86_64__)
6	fprintf (f,	6	fprintf (f,
7	- "CFLAGS += -O3 -fno-common -mcmodel=kernel -mno-red-zone -fno-asynchronous-unwind-tables -ffreestanding\n");	7	- "CFLAGS += -O3 -fno-common -mcmodel=kernel -mno-red-zone -fno-asynchronous-unwind-tables -ffreestanding\n");
8	+ "CFLAGS += -O3 -fno-common -mcmodel=kernel -mno-red-zone -fno-asynchronous-unwind-tables -ffreestanding -mno-sse\n");	8	+ "CFLAGS += -O3 -fno-common -DKLD_MODULE -mcmodel=kernel -mno-red-zone -fno-asynchronous-unwind-tables -ffreestanding -mno-sse\n");
9	# endif	9	# endif
10	}	10	}

Return to bug 233018

Line 0 Link Here

(-)files/patch-kernel_OS_FreeBSD_wrapper_bsddefs.h (+13 lines)
	1	--- kernel/OS/FreeBSD/wrapper/bsddefs.h.orig 2019-01-06 18:38:02 UTC
	2	+++ kernel/OS/FreeBSD/wrapper/bsddefs.h
	3	@@ -91,7 +91,10 @@ typedef int ddi_iblock_cookie_t;
	4	extern void oss_udelay (unsigned long t);
	5
	6	#ifdef _KERNEL
	7	+#ifdef memset
	8	+#undef memset
	9	#define memset oss_memset
	10	+#endif
	11	extern void oss_memset (void t, int val, int l);
	12	#endif
	13