diff options
| author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2023-08-31 02:08:10 +0000 |
|---|---|---|
| committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2023-08-31 02:08:10 +0000 |
| commit | 9263318fd2cce6e185f721d0e1f50c2818ada19f (patch) | |
| tree | 5636872e2d060ccca205e870bc6fed4ec93fb354 | |
| parent | f83282cf66e59fced2972a4d56d0bcfd490157d0 (diff) | |
| download | ports-9263318fd2cce6e185f721d0e1f50c2818ada19f.tar.gz ports-9263318fd2cce6e185f721d0e1f50c2818ada19f.zip | |
math/blahtexml: revert/redo previous bogus build "fix" against Clang 16
- Patch the makefile to respect CXXFLAGS so that USE_CXXSTD=c++11 works
as intended and remove the whole `USES+=llvm:max=15' abomination
- While here, convert to USES+=iconv, and drop MAKE_ARGS and LDFLAGS as
we need to patch that line in the makefile anyway
Fixes: f3eeadc739f9
| -rw-r--r-- | math/blahtexml/Makefile | 20 | ||||
| -rw-r--r-- | math/blahtexml/files/patch-makefile | 15 |
2 files changed, 15 insertions, 20 deletions
diff --git a/math/blahtexml/Makefile b/math/blahtexml/Makefile index 3619a4cf7b1a..49d63d8b5167 100644 --- a/math/blahtexml/Makefile +++ b/math/blahtexml/Makefile @@ -9,32 +9,18 @@ WWW= http://gva.noekeon.org/blahtexml/ LICENSE= BSD3CLAUSE -LIB_DEPENDS= libiconv.so:converters/libiconv \ - libxerces-c.so:textproc/xerces-c3 - -USES= gmake localbase:ldflags +LIB_DEPENDS= libxerces-c.so:textproc/xerces-c3 +USES= gmake iconv localbase +USE_CXXSTD= c++11 USE_GITHUB= yes GH_ACCOUNT= gvanas MAKEFILE= makefile -MAKE_ARGS= CFLAGS="${CFLAGS}" - ALL_TARGET= blahtexml-linux -LDFLAGS+= -liconv - PLIST_FILES= bin/${PORTNAME} -.include <bsd.port.options.mk> - -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) -USES+= llvm:max=15 -CC= clang${LLVM_VERSION} -CPP= clang-cpp${LLVM_VERSION} -CXX= clang++${LLVM_VERSION} -.endif - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin diff --git a/math/blahtexml/files/patch-makefile b/math/blahtexml/files/patch-makefile index 870d18275743..5d1a851efca5 100644 --- a/math/blahtexml/files/patch-makefile +++ b/math/blahtexml/files/patch-makefile @@ -1,11 +1,20 @@ ---- makefile.orig 2021-09-23 07:29:40 UTC +--- makefile.orig 2023-03-27 19:53:27 UTC +++ makefile -@@ -120,7 +120,7 @@ blahtex-mac: $(BINDIR) $(OBJECTS) $(HEADERS) +@@ -111,7 +111,7 @@ $(BINDIR)/%.o:%.c + $(CC) $(INCLUDES) $(CFLAGS) -c $< -o $@ + + $(BINDIR_XMLIN)/%.o:%.cpp +- $(CXX) $(INCLUDES) $(CFLAGS) -DBLAHTEXML_USING_XERCES -c $< -o $@ ++ $(CXX) $(INCLUDES) $(CXXFLAGS) -DBLAHTEXML_USING_XERCES -c $< -o $@ + + $(BINDIR_XMLIN)/%.o:%.c + $(CC) $(INCLUDES) $(CFLAGS) -DBLAHTEXML_USING_XERCES -c $< -o $@ +@@ -123,7 +123,7 @@ blahtex-mac: $(BINDIR) $(OBJECTS) $(HEADERS) $(CXX) $(CFLAGS) -o blahtex -liconv $(OBJECTS) blahtexml-linux: $(BINDIR_XMLIN) $(OBJECTS_XMLIN) $(HEADERS_XMLIN) - $(CXX) $(CFLAGS) -o blahtexml $(OBJECTS_XMLIN) -lxerces-c -+ $(CXX) $(CFLAGS) $(LDFLAGS) -o blahtexml $(OBJECTS_XMLIN) -lxerces-c ++ $(CXX) $(CXXFLAGS) -o blahtexml $(OBJECTS_XMLIN) $(LIBS) -lxerces-c blahtexml-mac: $(BINDIR_XMLIN) $(OBJECTS_XMLIN) $(HEADERS_XMLIN) $(CXX) $(CFLAGS) -o blahtexml -liconv $(OBJECTS_XMLIN) -lxerces-c |