- Fix xmess build on FreeBSD 4:
RELENG_4's ld cannot link code with duplicate symbols. I've decided to not link messtest at all since we don't even install it. PR: ports/77521 Submitted by: Miguel Mendez <flynn@energyhq.es.eu.org> (maintainer)
This commit is contained in:
parent
be85566a2b
commit
5b6ced962c
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=128950
3 changed files with 22 additions and 7 deletions
|
@ -253,13 +253,6 @@ do-configure:
|
|||
.endfor
|
||||
${LN} -s ${WRKSRC}/src/png.h ${WRKSRC}/src/mame_png.h
|
||||
|
||||
.if ${MAMEMESS} == "mess"
|
||||
.if ${OSVERSION} < 500000
|
||||
${REINPLACE_CMD} -e "s@-Wl,--allow-multiple-definition@@" \
|
||||
${WRKSRC}/makefile.mes ${WRKSRC}/src/unix/unix.mak
|
||||
.endif
|
||||
.endif
|
||||
|
||||
post-build:
|
||||
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} SDL_VIDEODRIVER=aalib \
|
||||
${GMAKE} doc/x${MAMEMESS}.6
|
||||
|
|
11
emulators/xmame/files/patch-makefile.mes
Normal file
11
emulators/xmame/files/patch-makefile.mes
Normal file
|
@ -0,0 +1,11 @@
|
|||
--- makefile.mes.orig Mon Feb 14 18:03:35 2005
|
||||
+++ makefile.mes Mon Feb 14 18:05:09 2005
|
||||
@@ -344,7 +344,7 @@
|
||||
$(OBJ)/mess/windows/parallel.o \
|
||||
$(OBJ)/mess/windows/strconv.o
|
||||
@echo Linking $@...
|
||||
- $(LD) $(LDFLAGS) $(CONSOLE_PROGRAM) $^ -Wl,--allow-multiple-definition $(ZLIB) $(LIBS) -lwinmm -o $@
|
||||
+ touch $@
|
||||
|
||||
# secondary libraries
|
||||
$(OBJ)/libexpat.a: $(OBJ)/expat/xmlparse.o $(OBJ)/expat/xmlrole.o $(OBJ)/expat/xmltok.o
|
11
emulators/xmame/files/patch-src-unix-unix.mak
Normal file
11
emulators/xmame/files/patch-src-unix-unix.mak
Normal file
|
@ -0,0 +1,11 @@
|
|||
--- src/unix/unix.mak.orig Mon Feb 14 18:08:49 2005
|
||||
+++ src/unix/unix.mak Mon Feb 14 18:09:12 2005
|
||||
@@ -599,7 +599,7 @@
|
||||
$(OBJDIR)/sysdep/rc.o \
|
||||
$(OBJDIR)/tststubs.o
|
||||
$(CC_COMMENT) @echo 'Linking $@...'
|
||||
- $(CC_COMPILE) $(LD) $(LDFLAGS) $(MY_LIBS) $^ -Wl,--allow-multiple-definition -o $@
|
||||
+ touch $@
|
||||
|
||||
$(OBJDIR)/tststubs.o: src/unix/tststubs.c
|
||||
$(CC_COMPILE) $(CC) $(MY_CFLAGS) -o $@ -c $<
|
Loading…
Reference in a new issue