Skip to content

Makefile improvements #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stef merged 3 commits into from
Jun 30, 2025
Merged

Makefile improvements #12

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
38a1082
makefile: Add -Werror=attributes -Werror=format-truncation
flynn162 Jun 29, 2025
500558d
makefile: Use more robust detections for pkgconf and libsodium
flynn162 Jun 29, 2025
933ffe1
makefile: Add an option to use '$ORIGIN' rpath in the final dylib
flynn162 Jun 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions src/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PREFIX?=/usr/local
INCLUDES=-Inoise_xk/include -Inoise_xk/include/karmel -Inoise_xk/include/karmel/minimal
CFLAGS?=-march=native -Wall -O2 -g \
-Werror=format-security -Werror=implicit-function-declaration \
-Werror=attributes -Werror=format-security -Werror=format-truncation -Werror=implicit-function-declaration \
-Wformat=2 -Wconversion -Wimplicit-fallthrough \
-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3 \
-fstack-protector-strong -fasynchronous-unwind-tables -fpic \
Expand Down Expand Up @@ -35,10 +35,21 @@ else
endif
endif

PKGCONF_MISSING := $(shell pkgconf --version >/dev/null; echo $$?)
ifneq ($(PKGCONF_MISSING),0)
$(error liboprf: Cannot find pkgconf)
endif

SODIUM_MISSING := $(shell pkgconf --exists libsodium; echo $$?)
ifneq ($(SODIUM_MISSING),0)
$(error liboprf: Cannot find libsodium via pkgconf. Check that libsodium has been installed)
endif

SODIUM_NEWER_THAN_1_0_18 := $(shell pkgconf --atleast-version=1.0.19 libsodium; echo $$?)
ifeq ($(SODIUM_NEWER_THAN_1_0_18),1)
ifneq ($(SODIUM_NEWER_THAN_1_0_18),0)
CFLAGS+= -Iaux_
EXTRA_SOURCES+= aux_/kdf_hkdf_sha256.c
$(info liboprf: Using auxiliary sources because libsodium is too old)
else
CFLAGS+= -DHAVE_SODIUM_HKDF=1
endif
Expand All @@ -48,6 +59,9 @@ CFLAGS+=$(INCLUDES)
SOURCES=oprf.c toprf.c dkg.c dkg-vss.c utils.c tp-dkg.c mpmult.c stp-dkg.c toprf-update.c $(EXTRA_SOURCES)
OBJECTS=$(patsubst %.c,%.o,$(SOURCES))

# Uncomment to use $ORIGIN as the runtime search path
#SOFLAGS += -Wl,-rpath,'$$'ORIGIN

all: liboprf.$(SOEXT) liboprf.$(STATICEXT) noise_xk/liboprf-noiseXK.$(SOEXT) liboprf.pc

debug: DEFINES=-DTRACE
Expand Down