d8bc30a282
- Update to the latest upstream commits upto 409828cf - Add clock_gettime() software time source - Add a code for choosing between software and hardware time sources https://github.com/smuellerDD/jitterentropy-library/pull/57 https://bugzilla.redhat.com/show_bug.cgi?id=1974132 Signed-off-by: Vladis Dronov <vdronov@redhat.com>
57 lines
2.4 KiB
Diff
57 lines
2.4 KiB
Diff
diff -up Makefile.orig Makefile
|
|
--- Makefileg 2021-07-13 17:23:42.954652287 +0200
|
|
+++ Makefile 2021-07-13 17:27:27.958549833 +0200
|
|
@@ -3,7 +3,7 @@
|
|
CC ?= gcc
|
|
#Hardening
|
|
CFLAGS ?= -fwrapv --param ssp-buffer-size=4 -fvisibility=hidden -fPIE -Wcast-align -Wmissing-field-initializers -Wshadow -Wswitch-enum
|
|
-CFLAGS +=-Wextra -Wall -pedantic -fPIC -O0 -fwrapv -Wconversion
|
|
+CFLAGS +=-Wp,-U_FORTIFY_SOURCE -Wextra -Wall -pedantic -fPIC -O0 -fwrapv -Wconversion
|
|
LDFLAGS +=-Wl,-z,relro,-z,now -lpthread
|
|
|
|
GCCVERSIONFORMAT := $(shell echo `$(CC) -dumpversion | sed 's/\./\n/g' | wc -l`)
|
|
@@ -28,7 +28,7 @@ LIBDIR := lib
|
|
INCDIR := include
|
|
SRCDIR := src
|
|
|
|
-INSTALL_STRIP ?= install -s
|
|
+INSTALL ?= install
|
|
|
|
NAME := jitterentropy
|
|
LIBMAJOR=$(shell cat $(SRCDIR)/jitterentropy-base.c | grep define | grep MAJVERSION | awk '{print $$3}')
|
|
@@ -73,25 +73,25 @@ cppcheck:
|
|
install: install-man install-shared install-includes
|
|
|
|
install-man:
|
|
- install -d -m 0755 $(DESTDIR)$(PREFIX)/share/man/man3
|
|
- install -m 644 doc/$(NAME).3 $(DESTDIR)$(PREFIX)/share/man/man3/
|
|
+ $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/share/man/man3
|
|
+ $(INSTALL) -m 644 doc/$(NAME).3 $(DESTDIR)$(PREFIX)/share/man/man3/
|
|
gzip -n -f -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3
|
|
|
|
install-shared:
|
|
- install -d -m 0755 $(DESTDIR)$(PREFIX)/$(LIBDIR)
|
|
- $(INSTALL_STRIP) -m 0755 lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/
|
|
+ $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/$(LIBDIR)
|
|
+ $(INSTALL) -m 0755 lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/
|
|
$(RM) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR)
|
|
ln -sf lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR)
|
|
ln -sf lib$(NAME).so.$(LIBMAJOR) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so
|
|
|
|
install-includes:
|
|
- install -d -m 0755 $(DESTDIR)$(PREFIX)/$(INCDIR)
|
|
- install -m 0644 jitterentropy.h $(DESTDIR)$(PREFIX)/$(INCDIR)/
|
|
- install -m 0644 jitterentropy-base-user.h $(DESTDIR)$(PREFIX)/$(INCDIR)/
|
|
+ $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/$(INCDIR)
|
|
+ $(INSTALL) -m 0644 jitterentropy.h $(DESTDIR)$(PREFIX)/$(INCDIR)/
|
|
+ $(INSTALL) -m 0644 jitterentropy-base-user.h $(DESTDIR)$(PREFIX)/$(INCDIR)/
|
|
|
|
install-static:
|
|
- install -d -m 0755 $(DESTDIR)$(PREFIX)/$(LIBDIR)
|
|
- install -m 0755 lib$(NAME).a $(DESTDIR)$(PREFIX)/$(LIBDIR)/
|
|
+ $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/$(LIBDIR)
|
|
+ $(INSTALL) -m 0755 lib$(NAME).a $(DESTDIR)$(PREFIX)/$(LIBDIR)/
|
|
|
|
clean:
|
|
@- $(RM) $(NAME)
|