work around locale weirdness in FC that affects sort.
This commit is contained in:
parent
fbc0a2728d
commit
f62f4c798d
|
@ -62,6 +62,7 @@ GREP ?= egrep
|
||||||
M4 ?= m4
|
M4 ?= m4
|
||||||
PYTHON ?= python
|
PYTHON ?= python
|
||||||
SED ?= sed
|
SED ?= sed
|
||||||
|
SORT ?= LC_ALL=C sort
|
||||||
|
|
||||||
CFLAGS += -Wall
|
CFLAGS += -Wall
|
||||||
|
|
||||||
|
|
|
@ -166,7 +166,7 @@ $(TMPDIR)/post_te_files.conf: $(M4SUPPORT) $(BASE_POST_TE_FILES)
|
||||||
# extract attributes and put them first. extract post te stuff
|
# extract attributes and put them first. extract post te stuff
|
||||||
# like genfscon and put last.
|
# like genfscon and put last.
|
||||||
$(TMPDIR)/all_attrs_types.conf $(TMPDIR)/only_te_rules.conf $(TMPDIR)/all_post.conf: $(TMPDIR)/all_te_files.conf $(TMPDIR)/post_te_files.conf
|
$(TMPDIR)/all_attrs_types.conf $(TMPDIR)/only_te_rules.conf $(TMPDIR)/all_post.conf: $(TMPDIR)/all_te_files.conf $(TMPDIR)/post_te_files.conf
|
||||||
$(verbose) $(get_type_attr_decl) $(TMPDIR)/all_te_files.conf | sort > $(TMPDIR)/all_attrs_types.conf
|
$(verbose) $(get_type_attr_decl) $(TMPDIR)/all_te_files.conf | $(SORT) > $(TMPDIR)/all_attrs_types.conf
|
||||||
$(verbose) cat $(TMPDIR)/post_te_files.conf > $(TMPDIR)/all_post.conf
|
$(verbose) cat $(TMPDIR)/post_te_files.conf > $(TMPDIR)/all_post.conf
|
||||||
# these have to run individually because order matters:
|
# these have to run individually because order matters:
|
||||||
$(verbose) $(GREP) '^sid ' $(TMPDIR)/all_te_files.conf >> $(TMPDIR)/all_post.conf || true
|
$(verbose) $(GREP) '^sid ' $(TMPDIR)/all_te_files.conf >> $(TMPDIR)/all_post.conf || true
|
||||||
|
|
|
@ -142,7 +142,7 @@ $(TMPDIR)/post_te_files.conf: $(M4SUPPORT) $(POST_TE_FILES)
|
||||||
# extract attributes and put them first. extract post te stuff
|
# extract attributes and put them first. extract post te stuff
|
||||||
# like genfscon and put last.
|
# like genfscon and put last.
|
||||||
$(TMPDIR)/all_attrs_types.conf $(TMPDIR)/only_te_rules.conf $(TMPDIR)/all_post.conf: $(TMPDIR)/all_te_files.conf $(TMPDIR)/post_te_files.conf
|
$(TMPDIR)/all_attrs_types.conf $(TMPDIR)/only_te_rules.conf $(TMPDIR)/all_post.conf: $(TMPDIR)/all_te_files.conf $(TMPDIR)/post_te_files.conf
|
||||||
$(verbose) $(get_type_attr_decl) $(TMPDIR)/all_te_files.conf | sort > $(TMPDIR)/all_attrs_types.conf
|
$(verbose) $(get_type_attr_decl) $(TMPDIR)/all_te_files.conf | $(SORT) > $(TMPDIR)/all_attrs_types.conf
|
||||||
$(verbose) cat $(TMPDIR)/post_te_files.conf > $(TMPDIR)/all_post.conf
|
$(verbose) cat $(TMPDIR)/post_te_files.conf > $(TMPDIR)/all_post.conf
|
||||||
# these have to run individually because order matters:
|
# these have to run individually because order matters:
|
||||||
$(verbose) $(GREP) '^sid ' $(TMPDIR)/all_te_files.conf >> $(TMPDIR)/all_post.conf || true
|
$(verbose) $(GREP) '^sid ' $(TMPDIR)/all_te_files.conf >> $(TMPDIR)/all_post.conf || true
|
||||||
|
|
Loading…
Reference in New Issue