termux-packages/packages/newsboat/Makefile.patch

73 lines
2.5 KiB
Diff
Raw Normal View History

2018-03-30 22:56:21 +02:00
diff -u -r ../newsboat-2.11/Makefile ./Makefile
--- ../newsboat-2.11/Makefile 2018-03-25 21:36:30.000000000 +0200
+++ ./Makefile 2018-03-30 22:52:36.721339528 +0200
2017-12-27 00:48:46 +01:00
@@ -9,6 +9,7 @@
# compiler
CXX?=c++
+CXX_host?=c++
# compiler and linker flags
DEFINES=-DLOCALEDIR=\"$(localedir)\"
2018-03-30 22:56:21 +02:00
@@ -20,7 +21,7 @@
2017-12-27 00:48:46 +01:00
2017-10-15 00:36:54 +02:00
WARNFLAGS=-Werror -Wall -Wextra -Wunreachable-code
INCLUDES=-Iinclude -Istfl -Ifilter -I. -Irss
2018-03-30 22:56:21 +02:00
-BARE_CXXFLAGS=-std=c++11 -O2 -ggdb $(INCLUDES)
+BARE_CXXFLAGS=-std=c++11 -O2 $(INCLUDES)
2017-12-27 00:48:46 +01:00
LDFLAGS+=-L.
2017-10-15 00:36:54 +02:00
PACKAGE=newsboat
2018-03-30 22:56:21 +02:00
@@ -34,7 +35,7 @@
LDFLAGS+=-fprofile-arcs -ftest-coverage
endif
-CXXFLAGS:=$(BARE_CXXFLAGS) $(WARNFLAGS) $(DEFINES) $(CXXFLAGS)
+CXXFLAGS:=$(BARE_CXXFLAGS) $(WARNFLAGS) $(DEFINES) $(CXXFLAGS) $(CPPFLAGS)
LIB_SOURCES:=$(shell cat mk/libboat.deps)
LIB_OBJS:=$(patsubst %.cpp,%.o,$(LIB_SOURCES))
@@ -47,7 +48,7 @@
2017-12-27 00:48:46 +01:00
NEWSBOAT=newsboat
NEWSBOAT_SOURCES:=$(shell cat mk/newsboat.deps)
NEWSBOAT_OBJS:=$(patsubst %.cpp,%.o,$(NEWSBOAT_SOURCES))
-NEWSBOAT_LIBS=-lboat -lfilter -lpthread -lrsspp
+NEWSBOAT_LIBS=-lboat -lfilter -lrsspp -landroid-glob
2017-10-15 00:36:54 +02:00
RSSPPLIB_SOURCES=$(sort $(wildcard rss/*.cpp))
RSSPPLIB_OBJS=$(patsubst rss/%.cpp,rss/%.o,$(RSSPPLIB_SOURCES))
2018-03-30 22:56:21 +02:00
@@ -57,7 +58,7 @@
2017-12-27 00:48:46 +01:00
PODBOAT=podboat
PODBOAT_SOURCES:=$(shell cat mk/podboat.deps)
PODBOAT_OBJS:=$(patsubst %.cpp,%.o,$(PODBOAT_SOURCES))
-PODBOAT_LIBS=-lboat -lpthread
+PODBOAT_LIBS=-lboat
2017-10-15 00:36:54 +02:00
ifeq (, $(filter Linux GNU GNU/%, $(shell uname -s)))
2017-12-27 00:48:46 +01:00
NEWSBOAT_LIBS+=-liconv -lintl
2018-03-30 22:56:21 +02:00
@@ -168,13 +169,13 @@
2017-12-27 00:48:46 +01:00
echo "td > pre { margin: 0; white-space: pre-wrap; }" >> doc/xhtml/docbook-xsl.css
doc/generate: doc/generate.cpp doc/split.h
- $(CXX) $(CXXFLAGS) -o doc/generate doc/generate.cpp
+ $(CXX_host) -o doc/generate doc/generate.cpp
doc/newsboat-cfgcmds.txt: doc/generate doc/configcommands.dsv
doc/generate doc/configcommands.dsv > doc/newsboat-cfgcmds.txt
doc/generate2: doc/generate2.cpp
- $(CXX) $(CXXFLAGS) -o doc/generate2 doc/generate2.cpp
+ $(CXX_host) -o doc/generate2 doc/generate2.cpp
doc/newsboat-keycmds.txt: doc/generate2 doc/keycmds.dsv
doc/generate2 doc/keycmds.dsv > doc/newsboat-keycmds.txt
2018-03-30 22:56:21 +02:00
@@ -192,7 +193,7 @@
2017-12-27 00:48:46 +01:00
$(A2X) -f manpage doc/manpage-podboat.txt
doc/gen-example-config: doc/gen-example-config.cpp doc/split.h
- $(CXX) $(CXXFLAGS) -o doc/gen-example-config doc/gen-example-config.cpp
+ $(CXX_host) -o doc/gen-example-config doc/gen-example-config.cpp
doc/example-config: doc/gen-example-config doc/configcommands.dsv
cat doc/configcommands.dsv | doc/gen-example-config > doc/example-config