From owner-svn-ports-head@freebsd.org Sat Jan 12 23:04:07 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 54AB414A16BC; Sat, 12 Jan 2019 23:04:07 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D9C3B737F4; Sat, 12 Jan 2019 23:04:06 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CC7F6A175; Sat, 12 Jan 2019 23:04:06 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0CN46tc032680; Sat, 12 Jan 2019 23:04:06 GMT (envelope-from fernape@FreeBSD.org) Received: (from fernape@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0CN466r032676; Sat, 12 Jan 2019 23:04:06 GMT (envelope-from fernape@FreeBSD.org) Message-Id: <201901122304.x0CN466r032676@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fernape set sender to fernape@FreeBSD.org using -f From: =?UTF-8?Q?Fernando_Apestegu=c3=ada?= Date: Sat, 12 Jan 2019 23:04:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r490082 - head/audio/oss/files X-SVN-Group: ports-head X-SVN-Commit-Author: fernape X-SVN-Commit-Paths: head/audio/oss/files X-SVN-Commit-Revision: 490082 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D9C3B737F4 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.969,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jan 2019 23:04:07 -0000 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"); }