From owner-svn-ports-head@freebsd.org Mon Jan 14 15:19:56 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 3514114A2817; Mon, 14 Jan 2019 15:19:56 +0000 (UTC) (envelope-from ehaupt@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 CA43B8BF58; Mon, 14 Jan 2019 15:19:55 +0000 (UTC) (envelope-from ehaupt@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 BD9834A66; Mon, 14 Jan 2019 15:19:55 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0EFJtUK012939; Mon, 14 Jan 2019 15:19:55 GMT (envelope-from ehaupt@FreeBSD.org) Received: (from ehaupt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0EFJtjM012937; Mon, 14 Jan 2019 15:19:55 GMT (envelope-from ehaupt@FreeBSD.org) Message-Id: <201901141519.x0EFJtjM012937@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ehaupt set sender to ehaupt@FreeBSD.org using -f From: Emanuel Haupt Date: Mon, 14 Jan 2019 15:19:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r490259 - in head/audio/ocp: . files X-SVN-Group: ports-head X-SVN-Commit-Author: ehaupt X-SVN-Commit-Paths: in head/audio/ocp: . files X-SVN-Commit-Revision: 490259 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: CA43B8BF58 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.95)[-0.954,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,0] 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: Mon, 14 Jan 2019 15:19:56 -0000 Author: ehaupt Date: Mon Jan 14 15:19:55 2019 New Revision: 490259 URL: https://svnweb.freebsd.org/changeset/ports/490259 Log: Fix build on i386 with lld as system linker. PR: 234836 (based on) Submitted by: emaste Reported by: antoine (via exp-run) Modified: head/audio/ocp/Makefile head/audio/ocp/files/patch-configure Modified: head/audio/ocp/Makefile ============================================================================== --- head/audio/ocp/Makefile Mon Jan 14 14:23:58 2019 (r490258) +++ head/audio/ocp/Makefile Mon Jan 14 15:19:55 2019 (r490259) @@ -3,7 +3,7 @@ PORTNAME= ocp PORTVERSION= 0.1.21 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= audio MASTER_SITES= SF/opencubicplayer/${DISTNAME} \ @@ -33,6 +33,7 @@ MAKE_JOBS_UNSAFE= yes CONFIGURE_ARGS= --with-dir-suffix="" \ --without-alsa \ --libdir=${PREFIX}/lib +CONFIGURE_ENV= SHARED_FLAGS="${LDFLAGS} -shared" INFO= ocp @@ -67,6 +68,8 @@ X11_USE= XORG=xxf86dga,xxf86vm,xpm,xext,x11 # needed despite stage-qa's warning SDL_USES= desktop-file-utils X11_USES= desktop-file-utils + +LDFLAGS_i386= -Wl,-z,notext post-patch: @${REINPLACE_CMD} -e 's|/etc/.*\.cfg|${TIMIDITY_CFG}|' \ Modified: head/audio/ocp/files/patch-configure ============================================================================== --- head/audio/ocp/files/patch-configure Mon Jan 14 14:23:58 2019 (r490258) +++ head/audio/ocp/files/patch-configure Mon Jan 14 15:19:55 2019 (r490259) @@ -1,6 +1,14 @@ --- configure.orig 2011-11-17 21:46:08 UTC +++ configure -@@ -4589,7 +4589,7 @@ else +@@ -4442,7 +4442,6 @@ case "$target" in + with_desktop_file_install=no + ;; + *) +- SHARED_FLAGS=-shared + LIB_SUFFIX=.so + PTHREAD_LIBS=-pthread + ;; +@@ -4589,7 +4588,7 @@ else '') as_fn_error $? "not found" "$LINENO" 5; ;;