mdw@git.distorted.org.uk Git - termux-packages/blob - packages/newsboat/Makefile.patch

   1 diff -u -r ../newsboat-2.10.2/Makefile ./Makefile
   2 --- ../newsboat-2.10.2/Makefile 2017-12-25 18:49:35.000000000 +0100
   3 +++ ./Makefile  2017-12-27 00:19:11.167077932 +0100
   4 @@ -9,6 +9,7 @@
   5
   6  # compiler
   7  CXX?=c++
   8 +CXX_host?=c++
   9
  10  # compiler and linker flags
  11  DEFINES=-DLOCALEDIR=\"$(localedir)\"
  12 @@ -20,8 +21,8 @@
  13
  14  WARNFLAGS=-Werror -Wall -Wextra -Wunreachable-code
  15  INCLUDES=-Iinclude -Istfl -Ifilter -I. -Irss
  16 -BARE_CXXFLAGS=-std=c++11 -ggdb $(INCLUDES)
  17 -CXXFLAGS+=$(BARE_CXXFLAGS) $(WARNFLAGS) $(DEFINES)
  18 +BARE_CXXFLAGS=-std=c++11 $(INCLUDES)
  19 +CXXFLAGS+=$(BARE_CXXFLAGS) $(WARNFLAGS) $(DEFINES) $(CPPFLAGS)
  20  LDFLAGS+=-L.
  21
  22  PACKAGE=newsboat
  23 @@ -46,7 +47,7 @@
  24  NEWSBOAT=newsboat
  25  NEWSBOAT_SOURCES:=$(shell cat mk/newsboat.deps)
  26  NEWSBOAT_OBJS:=$(patsubst %.cpp,%.o,$(NEWSBOAT_SOURCES))
  27 -NEWSBOAT_LIBS=-lboat -lfilter -lpthread -lrsspp
  28 +NEWSBOAT_LIBS=-lboat -lfilter -lrsspp -landroid-glob
  29
  30  RSSPPLIB_SOURCES=$(sort $(wildcard rss/*.cpp))
  31  RSSPPLIB_OBJS=$(patsubst rss/%.cpp,rss/%.o,$(RSSPPLIB_SOURCES))
  32 @@ -56,7 +57,7 @@
  33  PODBOAT=podboat
  34  PODBOAT_SOURCES:=$(shell cat mk/podboat.deps)
  35  PODBOAT_OBJS:=$(patsubst %.cpp,%.o,$(PODBOAT_SOURCES))
  36 -PODBOAT_LIBS=-lboat -lpthread
  37 +PODBOAT_LIBS=-lboat
  38
  39  ifeq (, $(filter Linux GNU GNU/%, $(shell uname -s)))
  40  NEWSBOAT_LIBS+=-liconv -lintl
  41 @@ -167,13 +168,13 @@
  42         echo "td > pre { margin: 0; white-space: pre-wrap; }" >> doc/xhtml/docbook-xsl.css
  43
  44  doc/generate: doc/generate.cpp doc/split.h
  45 -       $(CXX) $(CXXFLAGS) -o doc/generate doc/generate.cpp
  46 +       $(CXX_host) -o doc/generate doc/generate.cpp
  47
  48  doc/newsboat-cfgcmds.txt: doc/generate doc/configcommands.dsv
  49         doc/generate doc/configcommands.dsv > doc/newsboat-cfgcmds.txt
  50
  51  doc/generate2: doc/generate2.cpp
  52 -       $(CXX) $(CXXFLAGS) -o doc/generate2 doc/generate2.cpp
  53 +       $(CXX_host) -o doc/generate2 doc/generate2.cpp
  54
  55  doc/newsboat-keycmds.txt: doc/generate2 doc/keycmds.dsv
  56         doc/generate2 doc/keycmds.dsv > doc/newsboat-keycmds.txt
  57 @@ -190,7 +191,7 @@
  58         $(A2X) -f manpage doc/manpage-podboat.txt
  59
  60  doc/gen-example-config: doc/gen-example-config.cpp doc/split.h
  61 -       $(CXX) $(CXXFLAGS) -o doc/gen-example-config doc/gen-example-config.cpp
  62 +       $(CXX_host) -o doc/gen-example-config doc/gen-example-config.cpp
  63
  64  doc/example-config: doc/gen-example-config doc/configcommands.dsv
  65         cat doc/configcommands.dsv | doc/gen-example-config > doc/example-config