On Wed, Apr 12, 2023 at 10:37:55AM +0000, Klemens Nanni wrote:
> On Wed, Apr 12, 2023 at 10:30:16AM +0000, Klemens Nanni wrote:
> > So update-workspaces.sh passes through arguments for premake5, which can
> > disable tests properly.
> >
> > To ensure we only used bundled versions where needed, zap the rest;
> > this also eliminates grep noise.
> >
> > Feedback? OK?
>
> correct diff.
Rebased after the PLIST hunk went in today (I mishandled the diffs).
Now also with variables before targets.
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/0ad/base/Makefile,v
retrieving revision 1.42
diff -u -p -r1.42 Makefile
--- Makefile 14 Apr 2023 10:14:22 -0000 1.42
+++ Makefile 14 Apr 2023 12:24:38 -0000
@@ -39,7 +39,6 @@ MODULES = lang/python
COMPILER = base-clang ports-gcc
MODPY_RUNDEP = No
-MODPY_ADJ_FILES = ../../../libraries/source/cxxtest-4.4/bin/cxxtestgen
MAKE_FLAGS = SILENT=
MAKE_ENV = CC="${CC}" \
@@ -70,6 +69,13 @@ CONFIGURE_ARGS += --disable-atlas
WRKSRC = ${WRKDIST}/build/workspaces/gcc
+# most tests fail without nvtt
+CONFIGURE_ARGS += --disable-tests
+
+post-extract:
+ # remove unused bundled sources
+ rm -rf
${WRKSRC}/libraries/source/{cxxtest-4.4,enet,miniupnpc,nvtt,valgrind}
+
do-build:
cd ${WRKDIST}/build/workspaces && \
${SETENV} CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" \
@@ -96,15 +102,5 @@ do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
${INSTALL_DATA} ${WRKDIST}/build/resources/0ad.png \
${PREFIX}/share/pixmaps/
-
-# most tests fail without nvtt
-NO_TEST = Yes
-# avoid building unused tests in ${WRKSRC}/Makefile
-MAKE_FLAGS += cxxtestroot_config='' \
- mocks_test_config='' \
- test_config=''
-
-#do-test:
-# cd ${WRKDIST}/binaries/system && ./test
.include <bsd.port.mk>
