diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2021-08-04 11:28:23 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2021-08-04 11:29:19 +0200 |
| commit | 54299be8f2e3020cc5747824be3cd48a9b879f86 (patch) | |
| tree | a43d4f4afd6c3f590420f0bcee298d252957fd1e | |
| parent | 0c72a4ecd06d5f0d7990efce045ba5bb5ee68f24 (diff) | |
| download | ptxdist-54299be8f2e3020cc5747824be3cd48a9b879f86.tar.gz ptxdist-54299be8f2e3020cc5747824be3cd48a9b879f86.tar.xz | |
avahi: fix building with iceccptxdist-2021.08.0
Needed for some version combinations of icecc and gcc. See
c1d4fe82e2455ba624a3de2d228f3cc70225399c ("qt5: fix build with icecc 1.2")
for more details.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/avahi.make | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/rules/avahi.make b/rules/avahi.make index d8d763909..8fb1d1e69 100644 --- a/rules/avahi.make +++ b/rules/avahi.make @@ -88,6 +88,11 @@ AVAHI_CONF_OPT := \ # warning: libavahi-glib.so.1, needed by ./.libs/libavahi-ui-gtk3.so, not found (try using -rpath or -rpath-link) AVAHI_LDFLAGS := -Wl,-rpath-link,$(AVAHI_DIR)/avahi-glib/.libs/ +ifdef PTXCONF_AVAHI_QT5 +AVAHI_MAKE_ENV := \ + ICECC_REMOTE_CPP=0 +endif + AVAHI_CFLAGS := -D_FILE_OFFSET_BITS=64 AVAHI_CXXFLAGS := -D_FILE_OFFSET_BITS=64 -std=c++11 |