Skip to content
Snippets Groups Projects
Commit 63bc64a6 authored by Eric Vidal's avatar Eric Vidal :speech_balloon:
Browse files

Merge branch 'master' into dev

parents 639897ab 27231540
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Makefile
+ 4
− 14
View file @ 63bc64a6
...@@ -65,8 +65,7 @@ endif ...@@ -65,8 +65,7 @@ endif
INSTALL_HTML := $(wildcard doc/$(version)/html/*.html) INSTALL_HTML := $(wildcard doc/$(version)/html/*.html)
INSTALL_MAN := $(wildcard doc/man/*/*) INSTALL_MAN := $(wildcard doc/man/*/*)
INSTALL_DATA := skel/halt skel/init skel/poweroff skel/rc.init skel/rc.init.container \ INSTALL_DATA := skel/halt skel/init skel/poweroff skel/rc.init skel/rc.init.container \
skel/rc.shutdown skel/reboot skel/shutdown skel/rc.shutdown.final skel/rc.shutdown skel/reboot skel/shutdown skel/rc.shutdown.final skel/init.conf
INSTALL_CONF := skel/init.conf
all: $(ALL_LIBS) $(ALL_BINS) $(ALL_INCLUDES) all: $(ALL_LIBS) $(ALL_BINS) $(ALL_INCLUDES)
...@@ -87,10 +86,10 @@ tgz: distclean ...@@ -87,10 +86,10 @@ tgz: distclean
strip: $(ALL_LIBS) $(ALL_BINS) strip: $(ALL_LIBS) $(ALL_BINS)
ifneq ($(strip $(STATIC_LIBS)),) ifneq ($(strip $(STATIC_LIBS)),)
exec $(STRIP) -x -R .note -R .comment -R .note.GNU-stack $(STATIC_LIBS) exec $(STRIP) -x -R .note -R .comment $(STATIC_LIBS)
endif endif
ifneq ($(strip $(ALL_BINS)$(SHARED_LIBS)),) ifneq ($(strip $(ALL_BINS)$(SHARED_LIBS)),)
exec $(STRIP) -R .note -R .comment -R .note.GNU-stack $(ALL_BINS) $(SHARED_LIBS) exec $(STRIP) -R .note -R .comment $(ALL_BINS) $(SHARED_LIBS)
endif endif
install: install-dynlib install-libexec install-bin install-lib install-include install-data install-conf install-html install-man install: install-dynlib install-libexec install-bin install-lib install-include install-data install-conf install-html install-man
...@@ -100,7 +99,6 @@ install-bin: $(BIN_TARGETS:%=$(DESTDIR)$(bindir)/%) ...@@ -100,7 +99,6 @@ install-bin: $(BIN_TARGETS:%=$(DESTDIR)$(bindir)/%)
install-lib: $(STATIC_LIBS:lib%.a.xyzzy=$(DESTDIR)$(libdir)/lib%.a) install-lib: $(STATIC_LIBS:lib%.a.xyzzy=$(DESTDIR)$(libdir)/lib%.a)
install-include: $(ALL_INCLUDES:src/include/$(package)/%.h=$(DESTDIR)$(includedir)/$(package)/%.h) install-include: $(ALL_INCLUDES:src/include/$(package)/%.h=$(DESTDIR)$(includedir)/$(package)/%.h)
install-data: $(INSTALL_DATA:skel/%=$(DESTDIR)$(skel)/%) install-data: $(INSTALL_DATA:skel/%=$(DESTDIR)$(skel)/%)
install-conf: $(INSTALL_CONF:skel/%=$(DESTDIR)$(sysconfdir)/66/%)
install-html: $(INSTALL_HTML:doc/$(version)/html/%.html=$(DESTDIR)$(datarootdir)/doc/$(package)/$(version)/%.html) install-html: $(INSTALL_HTML:doc/$(version)/html/%.html=$(DESTDIR)$(datarootdir)/doc/$(package)/$(version)/%.html)
install-man: install-man1 install-man5 install-man8 install-man: install-man1 install-man5 install-man8
install-man1: $(INSTALL_MAN:doc/man/man1/%.1=$(DESTDIR)$(mandir)/man1/%.1) install-man1: $(INSTALL_MAN:doc/man/man1/%.1=$(DESTDIR)$(mandir)/man1/%.1)
...@@ -218,14 +216,6 @@ $(DESTDIR)$(mandir)/man8/%.8: doc/man/man8/%.8 ...@@ -218,14 +216,6 @@ $(DESTDIR)$(mandir)/man8/%.8: doc/man/man8/%.8
-e 's,%%service_userconf%%,$(service_userconf),g' \ -e 's,%%service_userconf%%,$(service_userconf),g' \
-e 's,%%user_log%%,$(user_log),g' $< > $@ -e 's,%%user_log%%,$(user_log),g' $< > $@
$(DESTDIR)$(sysconfdir)/66/%: skel/%
exec $(INSTALL) -D -m 644 $< $@
grep -- ^$(@F) < package/modes | { read name mode owner && \
if [ x$$owner != x ] ; then chown -- $$owner $@ ; fi && \
chmod $$mode $@ ; } && \
exec sed -e "s/@LIVEDIR@/$(subst /,\/,$(livedir))/g" \
-e "s/@SKEL@/$(subst /,\/,$(skel))/g" $< > $@
$(DESTDIR)$(skel)/%: skel/% $(DESTDIR)$(skel)/%: skel/%
exec $(INSTALL) -D -m 644 $< $@ exec $(INSTALL) -D -m 644 $< $@
grep -- ^$(@F) < package/modes | { read name mode owner && \ grep -- ^$(@F) < package/modes | { read name mode owner && \
...@@ -269,6 +259,6 @@ lib%.a.xyzzy: ...@@ -269,6 +259,6 @@ lib%.a.xyzzy:
lib%.so.xyzzy: lib%.so.xyzzy:
exec $(CC) -o $@ $(CFLAGS_ALL) $(CFLAGS_SHARED) $(LDFLAGS_ALL) $(LDFLAGS_SHARED) -Wl,-soname,$(patsubst lib%.so.xyzzy,lib%.so.$(version_M),$@) $^ $(EXTRA_LIBS) $(LDLIBS) exec $(CC) -o $@ $(CFLAGS_ALL) $(CFLAGS_SHARED) $(LDFLAGS_ALL) $(LDFLAGS_SHARED) -Wl,-soname,$(patsubst lib%.so.xyzzy,lib%.so.$(version_M),$@) $^ $(EXTRA_LIBS) $(LDLIBS)
.PHONY: it all clean distclean tgz strip install install-dynlib install-libexec install-bin install-lib install-include install-data install-conf install-html install-man .PHONY: it all clean distclean tgz strip install install-dynlib install-libexec install-bin install-lib install-include install-data install-html install-man
.DELETE_ON_ERROR: .DELETE_ON_ERROR:
README.md
+ 3
− 3
View file @ 63bc64a6
...@@ -45,9 +45,9 @@ Contact information ...@@ -45,9 +45,9 @@ Contact information
* Web site: * Web site:
https://web.obarun.org/ https://web.obarun.org/
* IRC Channel: * XMPP Channel:
Network: `chat.freenode.net` obarun@muc.syntazia.org
Channel : `#obarun`
Supports the project Supports the project
--------------------- ---------------------
......
configure
+ 7
− 7
View file @ 63bc64a6
...@@ -130,7 +130,7 @@ stripdir () { ...@@ -130,7 +130,7 @@ stripdir () {
tryflag () { tryflag () {
echo "Checking whether compiler accepts $2 ..." echo "Checking whether compiler accepts $2 ..."
echo "typedef int x;" > "$tmpc" echo "typedef int x;" > "$tmpc"
if $CC_AUTO $CPPFLAGS_AUTO $CPPFLAGS $CPPFLAGS_POST $CFLAGS_AUTO $CFLAGS $CFLAGS_POST "$2" -c -o /dev/null "$tmpc" >/dev/null 2>&1 ; then if $CC_AUTO $CPPFLAGS_AUTO $CPPFLAGS $CPPFLAGS_POST $CFLAGS_AUTO $CFLAGS $CFLAGS_POST "$2" -c -o "$tmpo" "$tmpc" >/dev/null 2>&1 ; then
echo " ... yes" echo " ... yes"
eval "$1=\"\${$1} \$2\"" eval "$1=\"\${$1} \$2\""
eval "$1=\${$1# }" eval "$1=\${$1# }"
...@@ -144,7 +144,7 @@ tryflag () { ...@@ -144,7 +144,7 @@ tryflag () {
tryldflag () { tryldflag () {
echo "Checking whether linker accepts $2 ..." echo "Checking whether linker accepts $2 ..."
echo "typedef int x;" > "$tmpc" echo "typedef int x;" > "$tmpc"
if $CC_AUTO $CFLAGS_AUTO $CFLAGS $CFLAGS_POST $LDFLAGS_AUTO $LDFLAGS $LDFLAGS_POST -nostdlib "$2" -o /dev/null "$tmpc" >/dev/null 2>&1 ; then if $CC_AUTO $CFLAGS_AUTO $CFLAGS $CFLAGS_POST $LDFLAGS_AUTO $LDFLAGS $LDFLAGS_POST -nostdlib "$2" -o "$tmpe" "$tmpc" >/dev/null 2>&1 ; then
echo " ... yes" echo " ... yes"
eval "$1=\"\${$1} \$2\"" eval "$1=\"\${$1} \$2\""
eval "$1=\${$1# }" eval "$1=\${$1# }"
...@@ -361,13 +361,15 @@ set -C ...@@ -361,13 +361,15 @@ set -C
while : ; do while : ; do
i=$((i+1)) i=$((i+1))
tmpc="./tmp-configure-$$-$PPID-$i.c" tmpc="./tmp-configure-$$-$PPID-$i.c"
tmpo="./tmp-configure-$$-$PPID-$i.o"
tmpe="./tmp-configure-$$-$PPID-$i.tmp" tmpe="./tmp-configure-$$-$PPID-$i.tmp"
2>|/dev/null > "$tmpc" && break 2>|/dev/null > "$tmpc" && break
2>|/dev/null > "$tmpo" && break
2>|/dev/null > "$tmpe" && break 2>|/dev/null > "$tmpe" && break
test "$i" -gt 50 && fail "$0: cannot create temporary files" test "$i" -gt 50 && fail "$0: cannot create temporary files"
done done
set +C set +C
trap 'rm -f "$tmpc" "$tmpe"' EXIT ABRT INT QUIT TERM HUP trap 'rm -f "$tmpc" "$tmpo" "$tmpe"' EXIT ABRT INT QUIT TERM HUP
# Set slashpackage values # Set slashpackage values
if $slashpackage ; then if $slashpackage ; then
...@@ -446,7 +448,7 @@ test -n "$CC_AUTO" || { echo "$0: cannot find a C compiler" ; exit 1 ; } ...@@ -446,7 +448,7 @@ test -n "$CC_AUTO" || { echo "$0: cannot find a C compiler" ; exit 1 ; }
echo " ... $CC_AUTO" echo " ... $CC_AUTO"
echo "Checking whether C compiler works... " echo "Checking whether C compiler works... "
echo "typedef int x;" > "$tmpc" echo "typedef int x;" > "$tmpc"
if $CC_AUTO $CPPFLAGS_AUTO $CPPFLAGS $CPPFLAGS_POST $CFLAGS_AUTO $CFLAGS $CFLAGS_POST -c -o /dev/null "$tmpc" 2>"$tmpe" ; then if $CC_AUTO $CPPFLAGS_AUTO $CPPFLAGS $CPPFLAGS_POST $CFLAGS_AUTO $CFLAGS $CFLAGS_POST -c -o "$tmpo" "$tmpc" 2>"$tmpe" ; then
echo " ... yes" echo " ... yes"
else else
echo " ... no. Compiler output follows:" echo " ... no. Compiler output follows:"
...@@ -487,7 +489,6 @@ tryflag CFLAGS -fomit-frame-pointer ...@@ -487,7 +489,6 @@ tryflag CFLAGS -fomit-frame-pointer
tryflag CFLAGS_AUTO -fno-exceptions tryflag CFLAGS_AUTO -fno-exceptions
tryflag CFLAGS_AUTO -fno-unwind-tables tryflag CFLAGS_AUTO -fno-unwind-tables
tryflag CFLAGS_AUTO -fno-asynchronous-unwind-tables tryflag CFLAGS_AUTO -fno-asynchronous-unwind-tables
tryflag CFLAGS_AUTO -Wa,--noexecstack
tryflag CFLAGS -fno-stack-protector tryflag CFLAGS -fno-stack-protector
tryflag CPPFLAGS_AUTO -Werror=implicit-function-declaration tryflag CPPFLAGS_AUTO -Werror=implicit-function-declaration
tryflag CPPFLAGS_AUTO -Werror=implicit-int tryflag CPPFLAGS_AUTO -Werror=implicit-int
...@@ -497,7 +498,6 @@ tryflag CPPFLAGS_AUTO -Wno-unused-value ...@@ -497,7 +498,6 @@ tryflag CPPFLAGS_AUTO -Wno-unused-value
tryflag CPPFLAGS_AUTO -Wno-parentheses tryflag CPPFLAGS_AUTO -Wno-parentheses
tryflag CFLAGS_AUTO -ffunction-sections tryflag CFLAGS_AUTO -ffunction-sections
tryflag CFLAGS_AUTO -fdata-sections tryflag CFLAGS_AUTO -fdata-sections
tryldflag LDFLAGS_AUTO -Wl,--sort-section=alignment tryldflag LDFLAGS_AUTO -Wl,--sort-section=alignment
tryldflag LDFLAGS_AUTO -Wl,--sort-common tryldflag LDFLAGS_AUTO -Wl,--sort-common
...@@ -636,7 +636,7 @@ All rights reserved.*/ ...@@ -636,7 +636,7 @@ All rights reserved.*/
#define ${package_macro_name}_VERSION "$version" #define ${package_macro_name}_VERSION "$version"
#define ${package_macro_name}_LIVE "$livedir/" #define ${package_macro_name}_LIVE "$livedir/"
#define ${package_macro_name}_SYSTEM_DIR "$system_dir/" #define ${package_macro_name}_SYSTEM_DIR "$system_dir/"
#define ${package_macro_name}_SKEL_DIR "$sysconfdir/66/" #define ${package_macro_name}_SKEL_DIR "$skel/"
#define ${package_macro_name}_LOGGER_SYSDIR "$system_log/" #define ${package_macro_name}_LOGGER_SYSDIR "$system_log/"
#define ${package_macro_name}_LOGGER_RUNNER "$s6log_user" #define ${package_macro_name}_LOGGER_RUNNER "$s6log_user"
#define ${package_macro_name}_LOGGER_TIMESTAMP $s6log_timestamp #define ${package_macro_name}_LOGGER_TIMESTAMP $s6log_timestamp
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment