mirrors/passt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "MAKE: Fix parallel builds; .o files; .gitignore; new makedocs"

Browse source 
This reverts commit cc2a6bec3c: I
applied that patch by mistake.

Fixes: cc2a6bec3c ("MAKE: Fix parallel builds; .o files; .gitignore; new makedocs")
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
Stefano Brivio 2023-07-10 06:33:44 +02:00
parent cc2a6bec3c
commit 023d684420
3 changed files with 26 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -1,5 +1,4 @@
*~ *~
*.o
/passt /passt
/passt.avx2 /passt.avx2
/pasta /pasta

51
Makefile
View file

@ -100,41 +100,29 @@ else
BIN := passt pasta qrap BIN := passt pasta qrap
endif endif
.NOTPARALLEL: seccomp.h all: $(BIN) $(MANPAGES) docs
all: seccomp.h $(BIN) $(MANPAGES) docs
PASST_OBJS = $(PASST_SRCS:.c=.o)
PASST_AVX2_OBJS = $(PASST_SRCS:.c=.avx2.o)
OBJS = $(SRCS:.c=.o)
QRAP_OBJS = $(QRAP_SRCS:.c=.o)
AVXFLAGS += -Ofast -mavx2 -ftree-vectorize -funroll-loops
static: FLAGS += -static -DGLIBC_NO_STATIC_NSS static: FLAGS += -static -DGLIBC_NO_STATIC_NSS
static: clean seccomp.h all static: clean all
seccomp.h: seccomp.sh $(PASST_SRCS) $(PASST_HEADERS) seccomp.h: seccomp.sh $(PASST_SRCS) $(PASST_HEADERS)
@ EXTRA_SYSCALLS="$(EXTRA_SYSCALLS)" ARCH="$(TARGET_ARCH)" CC="$(CC)" ./seccomp.sh $(PASST_SRCS) $(PASST_HEADERS) @ EXTRA_SYSCALLS="$(EXTRA_SYSCALLS)" ARCH="$(TARGET_ARCH)" CC="$(CC)" ./seccomp.sh $(PASST_SRCS) $(PASST_HEADERS)
.c.o: passt: $(PASST_SRCS) $(HEADERS)
$(CC) $(FLAGS) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ $(CC) $(FLAGS) $(CFLAGS) $(CPPFLAGS) $(PASST_SRCS) -o passt $(LDFLAGS)
$(PASST_AVX2_OBJS): seccomp.h passt.avx2: FLAGS += -Ofast -mavx2 -ftree-vectorize -funroll-loops
$(CC) $(AVXFLAGS) $(FLAGS) $(CFLAGS) $(CPPFLAGS) -c $(@:.avx2.o=.c) -o $@ passt.avx2: $(PASST_SRCS) $(HEADERS)
$(CC) $(filter-out -O2,$(FLAGS)) $(CFLAGS) $(CPPFLAGS) \
$(PASST_SRCS) -o passt.avx2 $(LDFLAGS)
passt: $(PASST_OBJS) seccomp.h passt.avx2: passt
$(CC) $(FLAGS) $(CFLAGS) $(CPPFLAGS) $(PASST_OBJS) -o passt $(LDFLAGS)
passt.avx2: $(PASST_AVX2_OBJS) $(HEADERS) seccomp.h
$(CC) $(filter-out -O2,$(FLAGS)) $(CFLAGS) $(CPPFLAGS) $(AVXFLAGS) \
$(PASST_AVX2_OBJS) -o passt.avx2 $(LDFLAGS)
passt.avx2: passt seccomp.h
pasta.avx2 pasta.1 pasta: pasta%: passt% pasta.avx2 pasta.1 pasta: pasta%: passt%
ln -sf $< $@ ln -sf $< $@
qrap: $(QRAP_OBJS) passt.h seccomp.h qrap: $(QRAP_SRCS) passt.h
$(CC) $(FLAGS) $(CFLAGS) $(CPPFLAGS) $(QRAP_OBJS) -o qrap $(LDFLAGS) $(CC) $(FLAGS) $(CFLAGS) $(CPPFLAGS) $(QRAP_SRCS) -o qrap $(LDFLAGS)
valgrind: EXTRA_SYSCALLS += rt_sigprocmask rt_sigtimedwait rt_sigaction \ valgrind: EXTRA_SYSCALLS += rt_sigprocmask rt_sigtimedwait rt_sigaction \
getpid gettid kill clock_gettime mmap \ getpid gettid kill clock_gettime mmap \
@ -182,8 +170,21 @@ pkgs: static
# other way around: the web version should be obtained by adding HTML and # other way around: the web version should be obtained by adding HTML and
# JavaScript portions to a plain Markdown, instead. However, cgit needs to use # JavaScript portions to a plain Markdown, instead. However, cgit needs to use
# a file in the git tree. Find a better way around this. # a file in the git tree. Find a better way around this.
docs: docs: README.md
[ ! -e doc/ ]; mkdir docs; perl makedocs.pl > docs/README.plain.md @( \
skip=0; \
while read l; do \
case $$l in \
"## Demo") exit 0 ;; \
"<!"*) ;; \
"</"*) skip=1 ;; \
"<"*) skip=2 ;; \
esac; \
\
[ $$skip -eq 0 ] && echo "$$l"; \
[ $$skip -eq 1 ] && skip=0; \
done < README.md; \
) > README.plain.md
# Checkers currently disabled for clang-tidy: # Checkers currently disabled for clang-tidy:
# - llvmlibc-restrict-system-libc-headers # - llvmlibc-restrict-system-libc-headers

19
makedocs.pl
View file

@ -1,19 +0,0 @@
use strict;
my $str = '';
my $regex = qr/(<[^\/].*?>.*?<\/.*?>\n?)|(<\/div>)|(<\/p>)/msp;
my $subst = '';
local $/=undef;
open FILE, '<', 'README.md' or die "Can't open file $!";
my $file_content = <FILE>;
close FILE;
#print "Source: $file_content\n";
my $result = $file_content =~ s/$regex//rg;
my $regex2 = qr/\n[ \n]{3,}\n/msp;
$result = $result =~ s/$regex2/\n\n/rg;
#print "The result of the substitution is: $result\n";
print "$result\n";