From c322ab13fe12ece33ca2c6596c04bcb4989c1c52 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Aug 27 2020 07:50:25 +0000 Subject: work around LTO build failure --- diff --git a/mod_auth_openidc-2.4.3-nonlto.patch b/mod_auth_openidc-2.4.3-nonlto.patch new file mode 100644 index 0000000..3e77856 --- /dev/null +++ b/mod_auth_openidc-2.4.3-nonlto.patch @@ -0,0 +1,15 @@ +--- mod_auth_openidc-2.4.3/Makefile.in.nonlto ++++ mod_auth_openidc-2.4.3/Makefile.in +@@ -73,8 +73,11 @@ + @NAMEVER@.tar.gz: $(DISTFILES) + tar -c --transform="s#^#@NAMEVER@/#" -vzf $@ $(DISTFILES) + ++APXS_CFLAGS := $(shell @APXS2@ -q CFLAGS | sed 's/-flto //') $(CFLAGS) ++APXS_CC := $(shell @APXS2@ -q CC) $(APXS_CFLAGS) $(shell @APXS2@ -q EXTRA_INCLUDES) ++ + test/test test/test-cmd: test/test.c test/test-cmd.c test/stub.c src/mod_auth_openidc.la +- @APXS2@ @APXS2_OPTS@ -Wc,"-DNAMEVER=\"@NAMEVER@\" $(CFLAGS)" -Wl,"$(LIBS)" -Isrc -Wc,-Wall -Wc,-g -c -o $@ $@.c test/stub.c $(SRC:.c=.lo) @APR_LIBS@ ++ $(APXS_CC) -DNAMEVER=\"@NAMEVER@\" $(CFLAGS) $(LIBS) -Isrc -Wall -g -o $@ $@.c test/stub.c $(SRC:.c=.o) @APR_LIBS@ + + test-compile: test/test test/test-cmd + diff --git a/mod_auth_openidc.spec b/mod_auth_openidc.spec index 634141e..3ff9d41 100644 --- a/mod_auth_openidc.spec +++ b/mod_auth_openidc.spec @@ -15,12 +15,13 @@ Name: mod_auth_openidc Version: 2.4.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: OpenID Connect auth module for Apache HTTP Server License: ASL 2.0 URL: https://github.com/zmartzone/mod_auth_openidc Source0: https://github.com/zmartzone/mod_auth_openidc/archive/v%{version}.tar.gz +Patch0: mod_auth_openidc-2.4.3-nonlto.patch BuildRequires: gcc BuildRequires: httpd-devel @@ -41,6 +42,7 @@ an OpenID Connect Relying Party and/or OAuth 2.0 Resource Server. %prep %setup -q +%patch0 -p1 -b .nonlto %build # workaround rpm-buildroot-usage @@ -93,6 +95,9 @@ install -m 700 -d $RPM_BUILD_ROOT%{httpd_pkg_cache_dir}/cache %dir %attr(0700, apache, apache) %{httpd_pkg_cache_dir}/cache %changelog +* Thu Aug 27 2020 Joe Orton - 2.4.3-4 +- work around LTO build failure + * Sat Aug 01 2020 Fedora Release Engineering - 2.4.3-3 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild