blob: ab44ae4e19fafb7e3d304ed59f3c0d28bb8b4b3f (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
$NetBSD: patch-Makefile,v 1.1 2020/06/30 13:24:05 schmonz Exp $
Avoid "echo -n" in subshells and unsupported linker flags to fix OS X build.
--- Makefile.orig 2018-02-23 16:24:54.000000000 +0000
+++ Makefile
@@ -69,7 +69,7 @@ adt/hashb.lo adt/hashb.o: ltcompile adt/
adt/hashs.lo adt/hashs.o: ltcompile adt/hashs.c include/bglibs/adt_common.h
./ltcompile adt/hashs.c
-all: sysdeps.h libraries programs man selftests
+all: sysdeps.h libraries programs man
base64/asc2bin.lo base64/asc2bin.o: ltcompile base64/asc2bin.c include/bglibs/base64.h include/bglibs/str.h sysdeps.h
./ltcompile base64/asc2bin.c
@@ -90,7 +90,7 @@ base64/encode_part.lo base64/encode_part
./ltcompile base64/encode_part.c
bg-installer: bg-installer.o ltload libbg-cli.la libbg.la bg-installer-cli.o
- ./ltload bg-installer libbg-cli.la libbg.la bg-installer-cli.o -lbg-cli -static
+ ./ltload bg-installer libbg-cli.la libbg.la bg-installer-cli.o -static
bg-installer-cli.c: bg-installer.cli cli-generate sysdeps.h
./cli-generate -c $< >$@
@@ -157,7 +157,7 @@ compile: conf-cc
chmod 755 compile
crc-gentab: crc-gentab.o load fmt/lcase.o fmt/ucase.o fmt/unum.o iobuf/iobuf_timeout.o iobuf/obuf_flush.o iobuf/obuf_pad.o iobuf/obuf_put3s.o iobuf/obuf_put5s.o iobuf/obuf_putc.o iobuf/obuf_putunumw.o iobuf/obuf_stderr.o iobuf/obuf_stdout.o iobuf/obuf_write.o msg/common.o msg/die.o sys/iopoll.o
- ./load crc-gentab fmt/lcase.o fmt/ucase.o fmt/unum.o iobuf/iobuf_timeout.o iobuf/obuf_flush.o iobuf/obuf_pad.o iobuf/obuf_put3s.o iobuf/obuf_put5s.o iobuf/obuf_putc.o iobuf/obuf_putunumw.o iobuf/obuf_stderr.o iobuf/obuf_stdout.o iobuf/obuf_write.o msg/common.o msg/die.o sys/iopoll.o -static
+ ./load crc-gentab fmt/lcase.o fmt/ucase.o fmt/unum.o iobuf/iobuf_timeout.o iobuf/obuf_flush.o iobuf/obuf_pad.o iobuf/obuf_put3s.o iobuf/obuf_put5s.o iobuf/obuf_putc.o iobuf/obuf_putunumw.o iobuf/obuf_stderr.o iobuf/obuf_stdout.o iobuf/obuf_write.o msg/common.o msg/die.o sys/iopoll.o
crc-gentab.o: compile crc-gentab.c sysdeps.h include/bglibs/iobuf.h include/bglibs/iobuf_common.h include/bglibs/ibuf.h include/iobuf_common.h include/bglibs/obuf.h sysdeps.h include/bglibs/msg.h sysdeps.h include/bglibs/debug.h
./compile crc-gentab.c
@@ -863,9 +863,7 @@ path/mktemp.lo path/mktemp.o: ltcompile
./ltcompile path/mktemp.c
perl-head.pl:
- ( set -e; PATH="/bin:/usr/bin:/usr/local/bin:$$PATH"; export PATH; \
- perl=`which perl`; \
- echo "#! $$perl"; \
+ ( echo "#! ${PERL5}"; \
echo "# WARNING: This file was auto-generated. Do not edit!"; \
echo ) >perl-head.pl
|
