Index: files/patch-kernel_OS_FreeBSD_wrapper_bsddefs.h =================================================================== --- files/patch-kernel_OS_FreeBSD_wrapper_bsddefs.h (nonexistent) +++ files/patch-kernel_OS_FreeBSD_wrapper_bsddefs.h (copia de trabajo) @@ -0,0 +1,13 @@ +--- 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 + Property changes on: files/patch-kernel_OS_FreeBSD_wrapper_bsddefs.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-setup_FreeBSD_build.sh =================================================================== --- files/patch-setup_FreeBSD_build.sh (revisión: 489485) +++ files/patch-setup_FreeBSD_build.sh (copia de trabajo) @@ -9,7 +9,7 @@ TXT2MAN=./txt2man fi -@@ -38,7 +38,7 @@ echo "OSSLIBDIR=$OSSLIBDIR" > prototype/ +@@ -38,7 +38,7 @@ echo "OSSLIBDIR=$OSSLIBDIR" > prototype/etc/oss.conf # Regenerating the config file templates rm -f /tmp/confgen @@ -18,7 +18,7 @@ then echo Building confgen failed exit 1 -@@ -146,7 +146,7 @@ cp .version prototype/$OSSLIBDIR/version +@@ -146,7 +146,7 @@ cp .version prototype/$OSSLIBDIR/version.dat # Licensing stuff if test -f $SRCDIR/4front-private/osslic.c then Index: files/patch-setup_FreeBSD_oss_build_install.sh =================================================================== --- files/patch-setup_FreeBSD_oss_build_install.sh (revisión: 489485) +++ files/patch-setup_FreeBSD_oss_build_install.sh (copia de trabajo) @@ -13,10 +13,11 @@ rm -f osscore_mainline.o ln -s osscore.lib osscore_mainline.o -@@ -59,17 +54,4 @@ do +@@ -58,18 +53,5 @@ do + make clean > /dev/null 2>&1 rm -f Makefile done - +- -if ! test -f $OSSLIBDIR/etc/installed_drivers -then - echo "-----------------------------" @@ -29,5 +30,5 @@ -then - echo "autosave_mixer yes" > $OSSLIBDIR/etc/userdefs -fi -- + exit 0 Index: files/patch-setup_srcconf__freebsd.inc =================================================================== --- files/patch-setup_srcconf__freebsd.inc (revisión: 489485) +++ files/patch-setup_srcconf__freebsd.inc (copia de trabajo) @@ -5,6 +5,6 @@ # if defined(__x86_64__) fprintf (f, - "CFLAGS += -O3 -fno-common -mcmodel=kernel -mno-red-zone -fno-asynchronous-unwind-tables -ffreestanding\n"); -+ "CFLAGS += -O3 -fno-common -mcmodel=kernel -mno-red-zone -fno-asynchronous-unwind-tables -ffreestanding -mno-sse\n"); ++ "CFLAGS += -O3 -fno-common -DKLD_MODULE -mcmodel=kernel -mno-red-zone -fno-asynchronous-unwind-tables -ffreestanding -mno-sse\n"); # endif }