Attachment 913852 Details for Bug 1115164 – proposed fix

[patch] proposed fix

makefile.patch (text/plain), 1.53 KB, created by Jakub Čajka on 2014-07-01 18:20:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jakub Čajka

Created: 2014-07-01 18:20:47 UTC

Size: 1.53 KB

patch

obsolete

>diff --git a/heimdal.spec b/heimdal.spec
>index 01c813a..9a67260 100644
>--- a/heimdal.spec
>+++ b/heimdal.spec
>@@ -67,6 +67,8 @@ Patch5: heimdal-1.6.0-229d8c7-libtool-macro.patch
> # Fix kadmin's setpgid() call under systemd
> # Submitted upstream for master at https://github.com/heimdal/heimdal/pull/100
> Patch6: heimdal-1.6.0-ddde77b-kadmin-setpgid.patch
>+#Fix rare race condition in Makefile causing build failure due missing header file kadm5_err.h observed on s390
>+Patch7: make.patch
> # We don't build X11 binaries, switch to new xorg-x11-devel
> # if we add it.
> #BuildRequires:  xorg-x11-devel
>@@ -218,6 +220,7 @@ PATH.
> %patch4 -p1 -b .declarations
> %patch5 -p1 -b .libtool
> %patch6 -p1 -b .setpgid
>+%patch7 -p1 -b .make
> 
> %if 0%{?need_autogen}
>   ./autogen.sh
>diff --git a/make.patch b/make.patch
>new file mode 100644
>index 0000000..8d81167
>--- /dev/null
>+++ b/make.patch
>@@ -0,0 +1,11 @@
>+diff -up heimdal-a5adc061079ddab92b9520e9c55f1c157c354f38/lib/kadm5/Makefile.am.make heimdal-a5adc061079ddab92b9520e9c55f1c157c354f38/lib/kadm5/Makefile.am
>+--- heimdal-a5adc061079ddab92b9520e9c55f1c157c354f38/lib/kadm5/Makefile.am.make	2014-07-01 13:49:43.390993934 +0200
>++++ heimdal-a5adc061079ddab92b9520e9c55f1c157c354f38/lib/kadm5/Makefile.am	2014-07-01 13:49:55.530036116 +0200
>+@@ -155,6 +155,7 @@ iprop-commands.c iprop-commands.h: iprop
>+ 	$(SLC) $(srcdir)/iprop-commands.in
>+ 
>+ $(libkadm5srv_la_OBJECTS): kadm5_err.h
>++$(libkadm5clnt_la_OBJECTS): kadm5_err.h
>+ $(iprop_log_OBJECTS): iprop-commands.h
>+ 
>+ client_glue.lo server_glue.lo: $(srcdir)/common_glue.c

Actions: View | Diff

Attachments on bug 1115164: 913851 | 913852