/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Teddy Hogeborn
  • Date: 2024-11-03 15:32:05 UTC
  • Revision ID: teddy@recompile.se-20241103153205-qota5ic1c4m2nqh4
Detect GPGME version correctly

It seems that newer versions of dpkg-query can print an empty version.
Change the code to also parse this output.

Reported-By: Pablo Abelenda <pabelenda@igalia.com>

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
44
44
LANGUAGE:=-std=gnu11
45
45
CPPFLAGS+=-D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64
46
46
htmldir:=man
47
 
version:=1.8.16
 
47
version:=1.8.17
48
48
SED:=sed
49
49
PKG_CONFIG?=pkg-config
50
50
 
289
289
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
290
290
                $@)
291
291
 
292
 
# Uses nested functions
 
292
# Does the linker support the --no-warn-execstack option?
 
293
ifeq ($(shell echo 'int main(){}'|$(CC) --language=c /dev/stdin -o /dev/null -Xlinker --no-warn-execstack >/dev/null 2>&1 && echo yes),yes)
 
294
# These programs use nested functions, which uses an executable stack
293
295
plugin-runner: LDFLAGS += -Xlinker --no-warn-execstack
294
296
dracut-module/password-agent: LDFLAGS += -Xlinker --no-warn-execstack
295
297
plugins.d/password-prompt: LDFLAGS += -Xlinker --no-warn-execstack
296
298
plugins.d/mandos-client: LDFLAGS += -Xlinker --no-warn-execstack
297
299
plugins.d/plymouth: LDFLAGS += -Xlinker --no-warn-execstack
 
300
endif
298
301
 
299
302
# Need to add the GnuTLS, Avahi and GPGME libraries
300
303
plugins.d/mandos-client: CFLAGS += $(GNUTLS_CFLAGS) $(strip \