SPECS: p2p.spec - reverted "use rpmldflags" from previous revision...
hawk
hawk at pld-linux.org
Fri Dec 8 14:59:51 CET 2006
Author: hawk Date: Fri Dec 8 13:59:51 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- reverted "use rpmldflags" from previous revision, breaks build
- workaround for builder automation to allow building against
kernel-grsecurity (via bcond)
- release 9
---- Files affected:
SPECS:
p2p.spec (1.21 -> 1.22)
---- Diffs:
================================================================
Index: SPECS/p2p.spec
diff -u SPECS/p2p.spec:1.21 SPECS/p2p.spec:1.22
--- SPECS/p2p.spec:1.21 Thu Nov 23 22:48:32 2006
+++ SPECS/p2p.spec Fri Dec 8 14:59:46 2006
@@ -6,7 +6,12 @@
%bcond_without smp # don't build SMP module
%bcond_without userspace # don't build userspace module
%bcond_with verbose # verbose build (V=1)
-
+%bcond_with grsec_kernel # build for kernel-grsecurity
+#
+%if %{with kernel} && %{with dist_kernel} && %{with grsec_kernel}
+%define alt_kernel grsecurity
+%endif
+#
%ifarch sparc
%undefine with_smp
%endif
@@ -15,7 +20,7 @@
%define iptables_ver 1.3.3
-%define _rel 8
+%define _rel 9
Summary: P2P - a netfilter extension to identify P2P filesharing traffic
Summary(pl): P2P - rozszerzenie filtra pakietów identyfikujące ruch P2P
Name: kernel%{_alt_kernel}-net-p2p
@@ -111,12 +116,12 @@
CFLAGS = %{rpmcflags} -fPIC -DIPTABLES_VERSION=\"%{iptables_ver}\"
#"-vim
INCPATH = -I../common
-LDFLAGS = %{rpmldflags}
+LD = %{__ld}
.SUFFIXES: .c .o .so
.c.o:
$(CC) $(CFLAGS) $(INCPATH) -c -o $@ $<
.o.so:
- $(CC) $(LDFLAGS) -shared -o $@ $<
+ $(LD) -shared -o $@ $<
all: libipt_p2p.so
EOF
%{__make} -C iptables
@@ -179,6 +184,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.22 2006/12/08 13:59:46 hawk
+- reverted "use rpmldflags" from previous revision, breaks build
+- workaround for builder automation to allow building against
+ kernel-grsecurity (via bcond)
+- release 9
+
Revision 1.21 2006/11/23 21:48:32 sparky
- use rpmldflags
- use -C in make and module building
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/p2p.spec?r1=1.21&r2=1.22&f=u
More information about the pld-cvs-commit
mailing list