sbase-sort_makefile.diff sorts all the lists in the Makefile. Sorry
that was bugging me.
sbase-getconf_guard.diff adds a guard file to the getconf rules so
that getconf.sh doesn't get run multiple times in parallel.
-emg
From a80d782ed8b7fb305096f20aa1615492b0a58e38 Mon Sep 17 00:00:00 2001
From: Evan Gates <evan.ga...@gmail.com>
Date: Thu, 29 Sep 2016 08:43:19 -0700
Subject: [PATCH] add guard file for getconf.sh rule to avoid multiple parallel
execution
for example try 'make -j4 getconf.c' and you will see getconf.sh run 4
times, this patch fixes that to only run once
---
Makefile | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 319a4c3..fde7a1d 100644
--- a/Makefile
+++ b/Makefile
@@ -207,8 +207,11 @@ $(LIBUTIL): $(LIBUTILOBJ)
getconf.c: confstr_l.h limits_l.h sysconf_l.h pathconf_l.h
-confstr_l.h limits_l.h sysconf_l.h pathconf_l.h: getconf.sh
+confstr_l.h limits_l.h sysconf_l.h pathconf_l.h: _getconf ;
+
+_getconf: getconf.sh
./getconf.sh
+ touch $@
install: all
mkdir -p $(DESTDIR)$(PREFIX)/bin
@@ -270,7 +273,7 @@ sbase-box-uninstall: uninstall
clean:
rm -f $(BIN) $(OBJ) $(LIB) sbase-box sbase-$(VERSION).tar.gz
- rm -f confstr_l.h limits_l.h sysconf_l.h pathconf_l.h
+ rm -f confstr_l.h limits_l.h sysconf_l.h pathconf_l.h _getconf
.PHONY:
- all install uninstall dist sbase-box sbase-box-install
sbase-box-uninstall clean
+ all install uninstall dist sbase-box sbase-box-install
sbase-box-uninstall clean _getconf
--
2.10.0
From 5edaa9f2ccced30183ae350504a08d8a81e4dad5 Mon Sep 17 00:00:00 2001
From: Evan Gates <evan.ga...@gmail.com>
Date: Thu, 29 Sep 2016 08:42:23 -0700
Subject: [PATCH] sort lists in Makefile
---
Makefile | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/Makefile b/Makefile
index 6b2bfdf..319a4c3 100644
--- a/Makefile
+++ b/Makefile
@@ -14,19 +14,15 @@ HDR =\
sha224.h\
sha256.h\
sha384.h\
- sha512.h\
sha512-224.h\
sha512-256.h\
+ sha512.h\
text.h\
utf.h\
util.h
LIBUTF = libutf.a
LIBUTFSRC =\
- libutf/rune.c\
- libutf/runetype.c\
- libutf/utf.c\
- libutf/utftorunestr.c\
libutf/fgetrune.c\
libutf/fputrune.c\
libutf/isalnumrune.c\
@@ -41,7 +37,11 @@ LIBUTFSRC =\
libutf/istitlerune.c\
libutf/isxdigitrune.c\
libutf/lowerrune.c\
- libutf/upperrune.c
+ libutf/rune.c\
+ libutf/runetype.c\
+ libutf/upperrune.c\
+ libutf/utf.c\
+ libutf/utftorunestr.c
LIBUTIL = libutil.a
LIBUTILSRC =\
@@ -71,9 +71,9 @@ LIBUTILSRC =\
libutil/sha224.c\
libutil/sha256.c\
libutil/sha384.c\
- libutil/sha512.c\
libutil/sha512-224.c\
libutil/sha512-256.c\
+ libutil/sha512.c\
libutil/strcasestr.c\
libutil/strlcat.c\
libutil/strlcpy.c\
@@ -113,8 +113,8 @@ BIN =\
getconf\
grep\
head\
- join\
hostname\
+ join\
kill\
link\
ln\
@@ -130,8 +130,8 @@ BIN =\
nl\
nohup\
od\
- pathchk\
paste\
+ pathchk\
printenv\
printf\
pwd\
@@ -146,9 +146,9 @@ BIN =\
sha224sum\
sha256sum\
sha384sum\
- sha512sum\
sha512-224sum\
sha512-256sum\
+ sha512sum\
sleep\
sort\
split\
--
2.10.0
