svn commit: r490082 - head/audio/oss/files

[Fernando Apesteguía]

Author: fernape
Date: Sat Jan 12 23:04:06 2019
New Revision: 490082
URL: https://svnweb.freebsd.org/changeset/ports/490082

Log:
  audio/oss: Fix breakage after r489819
  
  The patch in r489819 broke the build in 11.
  
  Address that and make sure this one builds in {11.2,12}{amd64,i386} and
  13-CURRENT i386
  
  PR:	234909
  Reported by:	leres@

Modified:
  head/audio/oss/files/patch-kernel_OS_FreeBSD_wrapper_bsddefs.h
  head/audio/oss/files/patch-setup_srcconf__freebsd.inc

Modified: head/audio/oss/files/patch-kernel_OS_FreeBSD_wrapper_bsddefs.h
==============================================================================
--- head/audio/oss/files/patch-kernel_OS_FreeBSD_wrapper_bsddefs.h	Sat Jan 12 21:18:07 2019	(r490081)
+++ head/audio/oss/files/patch-kernel_OS_FreeBSD_wrapper_bsddefs.h	Sat Jan 12 23:04:06 2019	(r490082)
@@ -1,13 +1,12 @@
---- kernel/OS/FreeBSD/wrapper/bsddefs.h.orig	2019-01-06 18:38:02 UTC
+--- kernel/OS/FreeBSD/wrapper/bsddefs.h.orig	2019-01-12 19:57:42 UTC
 +++ kernel/OS/FreeBSD/wrapper/bsddefs.h
-@@ -91,7 +91,10 @@ typedef int ddi_iblock_cookie_t;
+@@ -91,6 +91,9 @@ typedef int ddi_iblock_cookie_t;
  extern void oss_udelay (unsigned long t);
  
  #ifdef _KERNEL
 +#ifdef memset
 +#undef memset
- #define memset oss_memset
 +#endif
+ #define memset oss_memset
  extern void *oss_memset (void *t, int val, int l);
  #endif
- 

Modified: head/audio/oss/files/patch-setup_srcconf__freebsd.inc
==============================================================================
--- head/audio/oss/files/patch-setup_srcconf__freebsd.inc	Sat Jan 12 21:18:07 2019	(r490081)
+++ head/audio/oss/files/patch-setup_srcconf__freebsd.inc	Sat Jan 12 23:04:06 2019	(r490082)
@@ -1,10 +1,14 @@
 --- setup/srcconf_freebsd.inc.orig	2014-02-14 22:59:55 UTC
 +++ setup/srcconf_freebsd.inc
-@@ -12,6 +12,6 @@ add_kernel_flags (FILE * f)
+@@ -10,8 +10,10 @@ check_sysdep (conf_t * conf, struct utsname *un)
+ static void
+ add_kernel_flags (FILE * f)
  {
++  fprintf (f, "CFLAGS += -DKLD_MODULE ");
  # 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  -DKLD_MODULE -mcmodel=kernel -mno-red-zone  -fno-asynchronous-unwind-tables -ffreestanding -mno-sse\n");
++	     "-O3 -fno-common -mcmodel=kernel -mno-red-zone  -fno-asynchronous-unwind-tables -ffreestanding -mno-sse");
  # endif
++  fprintf(f, "\n");
  }