diff options
| author | Fernando Apesteguía <fernape@FreeBSD.org> | 2019-01-12 23:04:06 +0000 |
|---|---|---|
| committer | Fernando Apesteguía <fernape@FreeBSD.org> | 2019-01-12 23:04:06 +0000 |
| commit | fba35c89f6ab852c6b83b460e41e7874a1b14fd3 (patch) | |
| tree | a00306dc1216c22514be776b5fe173bfbc8275b9 /audio/oss | |
| parent | 08f11e4ef78561f3fc930282e2f607e5ceb08a22 (diff) | |
| download | ports-fba35c89f6ab852c6b83b460e41e7874a1b14fd3.tar.gz ports-fba35c89f6ab852c6b83b460e41e7874a1b14fd3.zip | |
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@
Notes
Notes:
svn path=/head/; revision=490082
Diffstat (limited to 'audio/oss')
| -rw-r--r-- | audio/oss/files/patch-kernel_OS_FreeBSD_wrapper_bsddefs.h | 7 | ||||
| -rw-r--r-- | audio/oss/files/patch-setup_srcconf__freebsd.inc | 8 |
2 files changed, 9 insertions, 6 deletions
diff --git a/audio/oss/files/patch-kernel_OS_FreeBSD_wrapper_bsddefs.h b/audio/oss/files/patch-kernel_OS_FreeBSD_wrapper_bsddefs.h index ebe220503b89..5d54af4237ab 100644 --- a/audio/oss/files/patch-kernel_OS_FreeBSD_wrapper_bsddefs.h +++ b/audio/oss/files/patch-kernel_OS_FreeBSD_wrapper_bsddefs.h @@ -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 - diff --git a/audio/oss/files/patch-setup_srcconf__freebsd.inc b/audio/oss/files/patch-setup_srcconf__freebsd.inc index 48e68c8c3763..0e72423536da 100644 --- a/audio/oss/files/patch-setup_srcconf__freebsd.inc +++ b/audio/oss/files/patch-setup_srcconf__freebsd.inc @@ -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"); } |