Build with $RPM_OPT_FLAGS and $RPM_LD_FLAGS.

This commit is contained in:
Ville Skyttä 2013-02-24 21:05:17 +02:00
parent 2e39f6a59c
commit 0b88293fb7
2 changed files with 29 additions and 4 deletions

View File

@ -0,0 +1,21 @@
diff -up libcap-2.22/Make.Rules~ libcap-2.22/Make.Rules
--- libcap-2.22/Make.Rules~ 2011-07-25 05:18:23.000000000 +0300
+++ libcap-2.22/Make.Rules 2013-02-24 20:58:45.681474100 +0200
@@ -48,7 +48,7 @@ KERNEL_HEADERS := $(topdir)/libcap/inclu
IPATH += -fPIC -I$(topdir)/libcap/include -I$(KERNEL_HEADERS)
CC := gcc
-CFLAGS := -O2 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+CFLAGS := $(RPM_OPT_FLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
BUILD_CC := $(CC)
BUILD_CFLAGS := $(CFLAGS) $(IPATH)
AR := ar
@@ -59,7 +59,7 @@ WARNINGS=-Wall -Wwrite-strings \
-Wstrict-prototypes -Wmissing-prototypes \
-Wnested-externs -Winline -Wshadow
LD=$(CC) -Wl,-x -shared
-LDFLAGS := #-g
+LDFLAGS := $(RPM_LD_FLAGS) #-g
SYSTEM_HEADERS = /usr/include
INCS=$(topdir)/libcap/include/sys/capability.h

View File

@ -1,8 +1,9 @@
Name: libcap
Version: 2.22
Release: 4%{?dist}
Release: 5%{?dist}
Summary: Library for getting and setting POSIX.1e capabilities
Source: http://www.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.6/%{name}-%{version}.tar.bz2
Patch0: %{name}-2.22-buildflags.patch
URL: http://ftp.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.6/
License: LGPLv2+
@ -30,11 +31,12 @@ libcap.
%prep
%setup -q
%patch0 -p1
%build
# libcap can not be build with _smp_mflags:
make PREFIX=%{_prefix} LIBDIR=%{_lib} SBINDIR=%{_sbindir} \
INCDIR=%{_includedir} MANDIR=%{_mandir} COPTFLAG="$RPM_OPT_FLAGS"
INCDIR=%{_includedir} MANDIR=%{_mandir}
%install
rm -rf ${RPM_BUILD_ROOT}
@ -43,8 +45,7 @@ make install RAISE_SETFCAP=no \
LIBDIR=${RPM_BUILD_ROOT}/%{_lib} \
SBINDIR=${RPM_BUILD_ROOT}/%{_sbindir} \
INCDIR=${RPM_BUILD_ROOT}/%{_includedir} \
MANDIR=${RPM_BUILD_ROOT}/%{_mandir}/ \
COPTFLAG="$RPM_OPT_FLAGS"
MANDIR=${RPM_BUILD_ROOT}/%{_mandir}
mkdir -p ${RPM_BUILD_ROOT}/%{_mandir}/man{2,3,8}
#mv -f doc/*.2 ${RPM_BUILD_ROOT}/%{_mandir}/man2/
mv -f doc/*.3 ${RPM_BUILD_ROOT}/%{_mandir}/man3/
@ -76,6 +77,9 @@ chmod +x ${RPM_BUILD_ROOT}/%{_lib}/*.so.*
rm -rf ${RPM_BUILD_ROOT}
%changelog
* Sun Feb 24 2013 Ville Skyttä <ville.skytta@iki.fi> - 2.22-5
- Build with $RPM_OPT_FLAGS and $RPM_LD_FLAGS.
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.22-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild