From c532b58b892ae2c9696306e11fe44491740b736d Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 26 Jul 2017 14:54:06 +0200 Subject: make use of program_invocation_name optional fixes build on linux --- Makefile | 12 +++++++++++- main.c | 5 ++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 6bbed9e..38372f5 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,17 @@ CC ?= gcc LD ?= gcc CFLAGS ?= -Werror -Wall -g -DDEBUG -LDFLAGS ?= +LDFLAGS ?= + +ifeq ($(shell uname),Darwin) +HAVE_PROGRAM_INVOCATION_NAME= +else +HAVE_PROGRAM_INVOCATION_NAME=1 +endif + +ifeq ($(HAVE_PROGRAM_INVOCATION_NAME),1) +CFLAGS += -DHAVE_PROGRAM_INVOCATION_NAME +endif aports-cache-objs := aports-cache.o diff --git a/main.c b/main.c index 4ee7aa8..f2320bc 100644 --- a/main.c +++ b/main.c @@ -11,7 +11,9 @@ #include "aports-cache.h" +#ifndef HAVE_PROGRAM_INVOCATION_NAME static char *program_invocation_name; +#endif static void usage(int exitcode) { @@ -45,8 +47,9 @@ int main(int argc, char *argv[]) int dirfd, rc; char *shell_argv[] = {"/bin/sh", NULL}; +#ifndef HAVE_PROGRAM_INVOCATION_NAME program_invocation_name = argv[0]; - +#endif while ((c = getopt_long(argc, argv, "fs:v", opts, &i)) != -1) { switch(c) { -- cgit v1.2.3