Attachment 639574 Details for Bug 873838 – Build with $RPM_LD_FLAGS and %{_smp_mflags}

[patch] Build with $RPM_LD_FLAGS and %{_smp_mflags}

rwho-buildflags.patch (text/plain), 1.25 KB, created by Ville Skyttä on 2012-11-06 19:41:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2012-11-06 19:41:10 UTC

Size: 1.25 KB

patch

obsolete

>diff --git a/rwho.spec b/rwho.spec
>index c5859e3..d8c1f2f 100644
>--- a/rwho.spec
>+++ b/rwho.spec
>@@ -48,31 +48,22 @@ are logged in to your local network.
> %patch9 -p1 -b .waitchild
> %patch10 -p1 -b .neighbours
> %patch11 -p1 -b .hostnamelen
>-
>-%build
>-sh configure --with-c-compiler=gcc
>-%ifarch s390 s390x
> %{__perl} -pi -e '
>-    s,^CC=.*$,CC=cc,;
>-    s,-O2,\$(RPM_OPT_FLAGS) -I../include -fPIC,;
>-    s,^LDFLAGS=,LDFLAGS=-pie,;
>+    s,^LDFLAGS=,LDFLAGS="\$RPM_LD_FLAGS -pie",;
>     s,^BINDIR=.*$,BINDIR=%{_bindir},;
>     s,^MANDIR=.*$,MANDIR=%{_mandir},;
>     s,^SBINDIR=.*$,SBINDIR=%{_sbindir},;
>     s,^LIBS=,LIBS=-lsystemd-daemon ,;
>-    ' MCONFIG
>+    ' configure
>+
>+%build
>+%ifarch s390 s390x
>+CFLAGS="$RPM_OPT_FLAGS -I../include -fPIC" \
> %else
>-%{__perl} -pi -e '
>-    s,^CC=.*$,CC=cc,;
>-    s,-O2,\$(RPM_OPT_FLAGS) -I../include -fpic,;
>-    s,^LDFLAGS=,LDFLAGS=-pie,;
>-    s,^BINDIR=.*$,BINDIR=%{_bindir},;
>-    s,^MANDIR=.*$,MANDIR=%{_mandir},;
>-    s,^SBINDIR=.*$,SBINDIR=%{_sbindir},;
>-    s,^LIBS=,LIBS=-lsystemd-daemon ,;
>-    ' MCONFIG
>+CFLAGS="$RPM_OPT_FLAGS -I../include -fpic" \
> %endif
>-LIBS="-lsystemd-daemon $LIBS" make RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
>+sh configure --with-c-compiler=gcc
>+make %{?_smp_mflags}
> 
> %install
> mkdir -p ${RPM_BUILD_ROOT}%{_bindir}

Actions: View | Diff

Attachments on bug 873838: 639574