diff options
| author | Lenni vH | 2021-09-15 15:26:04 +0200 |
|---|---|---|
| committer | Lenni vH | 2021-09-15 15:33:39 +0200 |
| commit | fe3daff1e0ebb2d61fba18653ad2f9146598ab6e (patch) | |
| tree | b28033cf4cfb3f1375c888651e148e62b8188084 /00-Makefile.patch | |
| parent | eef0dbfca845d2a433ff7505d6b73ad28dcc05f0 (diff) | |
| download | aur-doas.tar.gz | |
Push to 6.3p6 + remove the makefile patch
The patch was necessary for a bugged Makefile,
however upstream fixed those issues
Diffstat (limited to '00-Makefile.patch')
| -rw-r--r-- | 00-Makefile.patch | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/00-Makefile.patch b/00-Makefile.patch deleted file mode 100644 index 211e138b5e15..000000000000 --- a/00-Makefile.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- src/doas-6.3p2/Makefile 2020-08-07 23:42:52.000000000 +0200 -+++ Makefile 2020-08-18 17:14:50.982152763 +0200 -@@ -2,10 +2,10 @@ - CC?=clang - YACC?=yacc - BIN=doas --PREFIX?=/usr/local -+PREFIX=/usr - MANDIR?=$(DESTDIR)$(PREFIX)/man --SYSCONFDIR?=$(DESTDIR)$(PREFIX)/etc --OBJECTS=doas.o env.o compat/execvpe.o compat/reallocarray.o y.tab.o -+SYSCONFDIR?=$(DESTDIR)/etc -+OBJECTS=doas.o env.o compat/execvpe.o compat/reallocarray.o y.tab.o - OPT?=-O2 - # Can set GLOBAL_PATH here to set PATH for target user. - # TARGETPATH=-DGLOBAL_PATH=\"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:\" -@@ -13,32 +13,11 @@ - CPPFLAGS+=-include compat/compat.h - LDFLAGS+=-lpam - UNAME_S := $(shell uname -s) --ifeq ($(UNAME_S),Linux) -- LDFLAGS+=-lpam_misc -- CPPFLAGS+=-Icompat -- CFLAGS+=-D_GNU_SOURCE -- COMPAT+=closefrom.o errc.o getprogname.o setprogname.o strlcat.o strlcpy.o strtonum.o verrc.o -- OBJECTS+=$(COMPAT:%.o=compat/%.o) --endif --ifeq ($(UNAME_S),FreeBSD) -- CFLAGS+=-DHAVE_LOGIN_CAP_H -- LDFLAGS+=-lutil --endif --ifeq ($(UNAME_S),SunOS) -- SAFE_PATH?=/bin:/sbin:/usr/bin:/usr/sbin:$(PREFIX)/bin:$(PREFIX)/sbin -- GLOBAL_PATH?=/bin:/sbin:/usr/bin:/usr/sbin:$(PREFIX)/bin:$(PREFIX)/sbin -- CPPFLAGS+=-Icompat -- CFLAGS+=-DSOLARIS_PAM -DSAFE_PATH=\"$(SAFE_PATH)\" -DGLOBAL_PATH=\"$(GLOBAL_PATH)\" -- COMPAT=errc.o pm_pam_conv.o setresuid.o verrc.o -- OBJECTS+=$(COMPAT:%.o=compat/%.o) --endif --ifeq ($(UNAME_S),Darwin) -- CPPFLAGS+=-Icompat -- COMPAT+=bsd-closefrom.o -- OBJECTS+=$(COMPAT:%.o=compat/%.o) -- # On MacOS the default man page path is /usr/local/share/man -- MANDIR=$(DESTDIR)$(PREFIX)/share/man --endif -+LDFLAGS+=-lpam_misc -+CPPFLAGS+=-Icompat -+CFLAGS+=-D_GNU_SOURCE -+COMPAT+=closefrom.o errc.o getprogname.o setprogname.o strlcat.o strlcpy.o strtonum.o verrc.o -+OBJECTS+=$(COMPAT:%.o=compat/%.o) - - all: $(OBJECTS) doas.1.final doas.conf.5.final - $(CC) -o $(BIN) $(OBJECTS) $(LDFLAGS) |