mirror of
https://git.freebsd.org/ports.git
synced 2025-04-30 18:46:38 -04:00
9263318fd2
- 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
20 lines
850 B
Text
20 lines
850 B
Text
--- makefile.orig 2023-03-27 19:53:27 UTC
|
|
+++ makefile
|
|
@@ -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) $(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
|