Date: Mon, 14 Jan 2019 15:19:55 +0000 (UTC) From: Emanuel Haupt <ehaupt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r490259 - in head/audio/ocp: . files Message-ID: <201901141519.x0EFJtjM012937@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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; ;;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901141519.x0EFJtjM012937>