Skip to content

Commit

Permalink
Merge pull request PowerDNS#14678 from omoerbeek/rec-meson-mplexer
Browse files Browse the repository at this point in the history
rec: meson build: link in right multiplexer
  • Loading branch information
omoerbeek authored Sep 17, 2024
2 parents c8000f7 + 0f3c5a1 commit aa1eb67
Showing 1 changed file with 20 additions and 1 deletion.
21 changes: 20 additions & 1 deletion pdns/recursordist/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ common_sources += files(
src_dir / 'mtasker_context.cc',
src_dir / 'negcache.cc',
src_dir / 'nsecrecords.cc',
src_dir / 'pollmplexer.cc',
src_dir / 'protozero.cc',
src_dir / 'proxy-protocol.cc',
src_dir / 'pubsuffixloader.cc',
Expand Down Expand Up @@ -200,6 +199,24 @@ foreach name, info: conditional_sources
endif
endforeach

mplexer_sources = [src_dir / 'pollmplexer.cc']
if have_linux
mplexer_sources += src_dir / 'epollmplexer.cc'
endif
if have_darwin
mplexer_sources += src_dir / 'kqueuemplexer.cc'
endif
if have_openbsd
mplexer_sources += src_dir / 'kqueuemplexer.cc'
endif
if have_freebsd
mplexer_sources += src_dir / 'kqueuemplexer.cc'
endif
if have_sunos
mplexer_sources += src_dir / 'devpollmplexer.cc'
mplexer_sources += src_dir / 'portsmplexer.cc'
endif

# Generate config.h
config_h = configure_file(configuration: conf, output: 'config.h')

Expand Down Expand Up @@ -373,6 +390,7 @@ tools = {
src_dir / 'rec-tcpout.cc',
src_dir / 'rec-snmp.cc',
src_dir / 'rec-tcp.cc',
mplexer_sources,
],
'manpages': ['pdns_recursor.1'],
'deps-extra': [
Expand Down Expand Up @@ -481,6 +499,7 @@ if get_option('unit-tests')
'testrunner': {
'main': [
src_dir / 'testrunner.cc',
mplexer_sources,
],
'deps-extra': [
librec_test,
Expand Down

0 comments on commit aa1eb67

Please sign in to comment.