diff options
| author | Roland Reichwein <mail@reichwein.it> | 2023-01-17 19:48:26 +0100 |
|---|---|---|
| committer | Roland Reichwein <mail@reichwein.it> | 2023-01-17 19:48:26 +0100 |
| commit | 9b0320c8b47c43adce1aa5d9821b67c1fa42e1d6 (patch) | |
| tree | fcfbd844e6e179ddc3b2a89f4248db1f3fd0fc19 | |
| parent | db915a76b83f3e9a4009702d28d068e399d2c7e8 (diff) | |
v1.8 Build fix
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | plugins/fcgi/Makefile | 4 | ||||
| -rw-r--r-- | plugins/fcgi/socket.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
@@ -2,7 +2,7 @@ include common.mk VERSION=$(shell dpkg-parsechangelog --show-field Version) -DISTROS=base debian11 ubuntu2204 ubuntu2210 +DISTROS=debian11 ubuntu2204 ubuntu2210 PROJECTNAME=webserver TGZNAME=$(shell ls -t ../$(PROJECTNAME)-$(VERSION).tar.xz | head -n1 | sed -e 's,^../,,') PLUGINS= \ diff --git a/plugins/fcgi/Makefile b/plugins/fcgi/Makefile index 81502c4..c597314 100644 --- a/plugins/fcgi/Makefile +++ b/plugins/fcgi/Makefile @@ -6,7 +6,7 @@ CXXFLAGS+= -fvisibility=hidden -fPIC CXXFLAGS+= -I../.. -LDLIBS=\ +LDLIBS+=\ -lreichwein \ -lboost_context \ -lboost_coroutine \ @@ -30,7 +30,7 @@ SRC=$(PROGSRC) all: $(PROJECTNAME).so webapp-runner $(PROJECTNAME).so: $(SRC:.cpp=.o) - $(CXX) $(CXXFLAGS) $^ -shared $(LIBS) -o $@ + $(CXX) $(LDFLAGS) $^ -shared $(LDLIBS) $(LIBS) -o $@ webapp-runner: webapp-runner.o fastcgiprocess.o $(CXX) $(LDFLAGS) $^ $(LDLIBS) $(LIBS) -o $@ diff --git a/plugins/fcgi/socket.cpp b/plugins/fcgi/socket.cpp index c899de5..7d607f6 100644 --- a/plugins/fcgi/socket.cpp +++ b/plugins/fcgi/socket.cpp @@ -246,7 +246,7 @@ std::string generate_unix_domain_socket(const std::string& directory) } FileSocketApp::FileSocketApp(const std::string& app_addr, boost::asio::io_context& io_context): - m_socket_file{generate_unix_domain_socket("/var/lib/webserver")}, + m_socket_file{generate_unix_domain_socket(fs::exists("/var/lib/webserver") ? "/var/lib/webserver" : ".")}, m_fcgi_process{app_addr, m_socket_file}, m_file_socket{m_socket_file, io_context} { |