Mirrors
/
freebsd-ports
mirror of https://git.freebsd.org/ports.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:	f3eeadc739
2023Q4
Alexey Dokuchaev 2023-08-31 02:08:10 +00:00
parent f83282cf66
commit 9263318fd2
2 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
math/blahtexml/Makefile
View File

@ -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

15
math/blahtexml/files/patch-makefile
View File

@ -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