diff options
| author | tijl <tijl@FreeBSD.org> | 2014-08-26 22:06:08 +0800 |
|---|---|---|
| committer | tijl <tijl@FreeBSD.org> | 2014-08-26 22:06:08 +0800 |
| commit | f8357b5cbaa160ccdf9943cac099f5e092c591da (patch) | |
| tree | d0c8617b772b8f0a175d436d938b8d844590b41f /games/gillo | |
| parent | 89a7d6ecbdde724b92ca6650493f56cf68855f35 (diff) | |
| download | freebsd-ports-gnome-f8357b5cbaa160ccdf9943cac099f5e092c591da.tar.gz freebsd-ports-gnome-f8357b5cbaa160ccdf9943cac099f5e092c591da.tar.zst freebsd-ports-gnome-f8357b5cbaa160ccdf9943cac099f5e092c591da.zip | |
- Fix missing library problems when the linker enforces explicit linking
PR: 192062
Exp-run by: antoine
Approved by: portmgr (antoine)
Diffstat (limited to 'games/gillo')
| -rw-r--r-- | games/gillo/Makefile | 13 | ||||
| -rw-r--r-- | games/gillo/files/patch-Jamrules | 7 | ||||
| -rw-r--r-- | games/gillo/files/patch-src_Jamfile | 10 |
3 files changed, 8 insertions, 22 deletions
diff --git a/games/gillo/Makefile b/games/gillo/Makefile index 1c403d5c9445..31a299a9281c 100644 --- a/games/gillo/Makefile +++ b/games/gillo/Makefile @@ -20,21 +20,20 @@ BUILD_DEPENDS= ${JAM}:${PORTSDIR}/devel/jam \ WRKSRC= ${WRKDIR}/${PORTNAME} USES= tar:bzip2 -USE_GL= gl +USE_GL= glu USE_SDL= yes JAM?= ${LOCALBASE}/bin/jam post-patch: - @${REINPLACE_CMD} -i '' -e 's|SDL/||g' ${WRKSRC}/src/* - @${REINPLACE_CMD} -e 's|%%SDL_CFLAGS%%|`${SDL_CONFIG} --cflags`|' \ - ${WRKSRC}/Jamrules - @${REINPLACE_CMD} -e 's|%%SDL_LDFLAGS%%|`${SDL_CONFIG} --libs`|' \ + @${REINPLACE_CMD} '/^LINKLIBS on gillo3/s|;$$|-L${LOCALBASE}/lib -lm ;|' \ ${WRKSRC}/src/Jamfile do-build: - cd ${WRKSRC} && ${SETENV} "C++=${CC}" "LOCALBASE=${LOCALBASE}" \ - "CFLAGS=${CFLAGS} -DDATADIR=\\\"${PREFIX}/share\\\"" \ + cd ${WRKSRC} && ${SETENV} C++="${CXX}" C++FLAGS="${CXXFLAGS}" \ + CCFLAGS="${CFLAGS} -DDATADIR=\\\"${PREFIX}/share\\\"" \ + HDRS="${LOCALBASE}/include" \ + LINK="${CXX}" LINKFLAGS="${LDFLAGS}" \ ${JAM} -dx -sPREFIX=${PREFIX} do-install: diff --git a/games/gillo/files/patch-Jamrules b/games/gillo/files/patch-Jamrules index e7e8e2c160a7..9e2b3d04fbb2 100644 --- a/games/gillo/files/patch-Jamrules +++ b/games/gillo/files/patch-Jamrules @@ -1,15 +1,12 @@ --- Jamrules.orig +++ Jamrules -@@ -5,8 +5,9 @@ +@@ -5,8 +5,6 @@ DATADIR = $(PREFIX)/share/gillo ; DOCDIR = $(PREFIX)/share/doc/gillo ; -CCFLAGS += -DENABLE_BINRELOC ; -if $(DEBUG) { CCFLAGS += -g -O0 -DDEBUG ; } -else CCFLAGS += -O3 ; -+CCFLAGS += $(CFLAGS) %%SDL_CFLAGS%% ; -+HDRS = $(LOCALBASE)/include ; -+#if $(DEBUG) { CCFLAGS += -g -O0 -DDEBUG ; } -+#else CCFLAGS += -O3 ; ++OPTIM = ; C++FLAGS += $(CCFLAGS) ; #LINKFLAGS += -static ; diff --git a/games/gillo/files/patch-src_Jamfile b/games/gillo/files/patch-src_Jamfile deleted file mode 100644 index 0b9f4e2dcd44..000000000000 --- a/games/gillo/files/patch-src_Jamfile +++ /dev/null @@ -1,10 +0,0 @@ ---- src/Jamfile.orig -+++ src/Jamfile -@@ -2,6 +2,6 @@ - - Main gillo3 : camera.cpp cameraball.cpp cameratrack.cpp car.cpp context.cpp cube.cpp entity.cpp event.cpp field.cpp game.cpp goal.cpp goalkeeper.cpp img.cpp main.cpp menu.cpp omnicar.cpp overlay.cpp player.cpp pwrup.cpp rect.cpp simpleball.cpp sound.cpp video.cpp viewport.cpp prefix.c iballpicker.cpp ; - --LINKLIBS on gillo3 = -lpthread -lGL -lGLU -lSDL -lode -lplibssgaux -lplibssg -lplibsg -lplibul -lplibsl ; -+LINKLIBS on gillo3 = -lGL -lGLU -lode -lplibssgaux -lplibssg -lplibsg -lplibul -lplibsl -L$(LOCALBASE)/lib %%SDL_LDFLAGS%% ; - - InstallBin $(BINDIR) : gillo3$(SUFEXE) ; |