diff options
| author | ehaupt <ehaupt@FreeBSD.org> | 2019-01-14 23:19:55 +0800 |
|---|---|---|
| committer | ehaupt <ehaupt@FreeBSD.org> | 2019-01-14 23:19:55 +0800 |
| commit | b8af5ccb101bc49d0144362cf694cf5f1410007d (patch) | |
| tree | d4b787921b822be32893d1964cde5bb02ecc77a0 /audio/ocp | |
| parent | ebea902cebf1bf68631b64594877f52c21661ab9 (diff) | |
| download | freebsd-ports-gnome-b8af5ccb101bc49d0144362cf694cf5f1410007d.tar.gz freebsd-ports-gnome-b8af5ccb101bc49d0144362cf694cf5f1410007d.tar.zst freebsd-ports-gnome-b8af5ccb101bc49d0144362cf694cf5f1410007d.zip | |
Fix build on i386 with lld as system linker.
PR: 234836 (based on)
Submitted by: emaste
Reported by: antoine (via exp-run)
Diffstat (limited to 'audio/ocp')
| -rw-r--r-- | audio/ocp/Makefile | 5 | ||||
| -rw-r--r-- | audio/ocp/files/patch-configure | 10 |
2 files changed, 13 insertions, 2 deletions
diff --git a/audio/ocp/Makefile b/audio/ocp/Makefile index 65f619517eca..79601561363f 100644 --- a/audio/ocp/Makefile +++ b/audio/ocp/Makefile @@ -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 @@ -68,6 +69,8 @@ X11_USE= XORG=xxf86dga,xxf86vm,xpm,xext,x11 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}|' \ ${WRKSRC}/playgmi/gmitimidity.c diff --git a/audio/ocp/files/patch-configure b/audio/ocp/files/patch-configure index d5eed433ff57..5d2608b552a8 100644 --- a/audio/ocp/files/patch-configure +++ b/audio/ocp/files/patch-configure @@ -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; ;; |