diff options
| author |   Marek Szuba <marecki@gentoo.org> | 2020-09-23 13:54:10 +0200 |
|---|---|---|
| committer | Marek Szuba <marecki@gentoo.org> | 2020-09-23 14:02:28 +0200 |
| commit | 49ec02e2a9c5581af83dfd9544cbc24ceeec4b67 (patch) | |
| tree | cb67486f7ac87b2e4e17e264a47b03a42c2e2c34 /net-misc/oidc-agent/files | |
| parent | dev-python/zipp: bump to 3.2.0 (diff) | |
| download | gentoo-49ec02e2a9c5581af83dfd9544cbc24ceeec4b67.tar.gz gentoo-49ec02e2a9c5581af83dfd9544cbc24ceeec4b67.tar.bz2 gentoo-49ec02e2a9c5581af83dfd9544cbc24ceeec4b67.zip | |
net-misc/oidc-agent: bump to 3.3.5
Signed-off-by: Marek Szuba <marecki@gentoo.org>
Diffstat (limited to 'net-misc/oidc-agent/files')
| -rw-r--r-- | net-misc/oidc-agent/files/oidc-agent-3.3.5_makefile-toolchain-vars.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/net-misc/oidc-agent/files/oidc-agent-3.3.5_makefile-toolchain-vars.patch b/net-misc/oidc-agent/files/oidc-agent-3.3.5_makefile-toolchain-vars.patch new file mode 100644 index 000000000000..b9d526a2122e --- /dev/null +++ b/net-misc/oidc-agent/files/oidc-agent-3.3.5_makefile-toolchain-vars.patch @@ -0,0 +1,48 @@ +1. Support user-provided values of CC, CFLAGS and LDFLAGS +2. Do not force the use of a static version of libsodium + +--- a/Makefile ++++ b/Makefile +@@ -54,20 +54,20 @@ + endif + + # Compiler options +-CC = gcc ++CC := $(CC) + # compiling flags here +-CFLAGS = -g -std=c99 -I$(SRCDIR) -I$(LIBDIR) -Wall -Wextra -fno-common ++CFLAGS := $(CFLAGS) -g -std=c99 -I$(SRCDIR) -I$(LIBDIR) -Wall -Wextra -fno-common + ifndef MAC_OS + CFLAGS += $(shell pkg-config --cflags libsecret-1) + endif + TEST_CFLAGS = $(CFLAGS) -I. + + # Linker options +-LINKER = gcc ++LINKER := $(CC) + ifdef MAC_OS + LFLAGS = -lsodium -largp + else +-LFLAGS = -l:libsodium.a -lseccomp -fno-common ++LFLAGS := $(LDFLAGS) -lsodium -lseccomp -fno-common + endif + ifdef HAS_CJSON + LFLAGS += -lcjson +@@ -81,7 +81,7 @@ + ifdef MAC_OS + CLIENT_LFLAGS = -L$(APILIB) -largp -loidc-agent.$(LIBVERSION) + else +-CLIENT_LFLAGS = -L$(APILIB) -l:$(SHARED_LIB_NAME_FULL) -lseccomp ++CLIENT_LFLAGS = $(LDFLAGS) -L$(APILIB) -l:$(SHARED_LIB_NAME_FULL) -lseccomp + endif + ifdef HAS_CJSON + CLIENT_LFLAGS += -lcjson +@@ -478,7 +478,7 @@ + ifdef MAC_OS + @gcc -dynamiclib -fpic -Wl, -o $@ $(PIC_OBJECTS) -lc + else +- @gcc -shared -fpic -Wl,-soname,$(SONAME) -o $@ $(PIC_OBJECTS) -lc ++ @$(LINKER) -shared -fpic -Wl,-soname,$(SONAME) $(LDFLAGS) -o $@ $(PIC_OBJECTS) -lc + endif + + .PHONY: shared_lib |