sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix build on i386 with lld as system linker.

Browse source 
PR:		234836 (based on)
Submitted by:	emaste
Reported by:	antoine (via exp-run)
This commit is contained in:
Emanuel Haupt 2019-01-14 15:19:55 +00:00
parent 19b56155f1
commit 7e0d66e1a4
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=490259
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
audio/ocp/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= ocp PORTNAME= ocp
PORTVERSION= 0.1.21 PORTVERSION= 0.1.21
PORTREVISION= 4 PORTREVISION= 5
PORTEPOCH= 1 PORTEPOCH= 1
CATEGORIES= audio CATEGORIES= audio
MASTER_SITES= SF/opencubicplayer/${DISTNAME} \ MASTER_SITES= SF/opencubicplayer/${DISTNAME} \
@ -33,6 +33,7 @@ MAKE_JOBS_UNSAFE= yes
CONFIGURE_ARGS= --with-dir-suffix="" \ CONFIGURE_ARGS= --with-dir-suffix="" \
--without-alsa \ --without-alsa \
--libdir=${PREFIX}/lib --libdir=${PREFIX}/lib
CONFIGURE_ENV= SHARED_FLAGS="${LDFLAGS} -shared"
INFO= ocp INFO= ocp
@ -68,6 +69,8 @@ X11_USE= XORG=xxf86dga,xxf86vm,xpm,xext,x11
SDL_USES= desktop-file-utils SDL_USES= desktop-file-utils
X11_USES= desktop-file-utils X11_USES= desktop-file-utils
LDFLAGS_i386= -Wl,-z,notext
post-patch: post-patch:
@${REINPLACE_CMD} -e 's|/etc/.*\.cfg|${TIMIDITY_CFG}|' \ @${REINPLACE_CMD} -e 's|/etc/.*\.cfg|${TIMIDITY_CFG}|' \
${WRKSRC}/playgmi/gmitimidity.c ${WRKSRC}/playgmi/gmitimidity.c

10
audio/ocp/files/patch-configure
View file

@ -1,6 +1,14 @@
--- configure.orig 2011-11-17 21:46:08 UTC --- configure.orig 2011-11-17 21:46:08 UTC
+++ configure +++ 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; as_fn_error $? "not found" "$LINENO" 5;
;; ;;