rpms/quagga/devel quagga-0.98.5-pie.patch, 1.2, 1.3 quagga.spec, 1.26, 1.27
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Oct 20 14:41:34 UTC 2005
- Previous message (by thread): rpms/gnome-applets/devel gnome-applets.spec,1.87,1.88
- Next message (by thread): rpms/util-linux/devel util-linux-2.13-ipcs-shmax.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 sources, 1.16, 1.17 util-linux.spec, 1.90, 1.91 cramfs-1.1-blocksize_and_quiet.patch, 1.1, NONE cramfs-1.1-pagesize.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: fenlason
Update of /cvs/dist/rpms/quagga/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11314
Modified Files:
quagga-0.98.5-pie.patch quagga.spec
Log Message:
No more late night hacking. This version actually compiles on multiple platforms.
quagga-0.98.5-pie.patch:
ltmain.sh | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Index: quagga-0.98.5-pie.patch
===================================================================
RCS file: /cvs/dist/rpms/quagga/devel/quagga-0.98.5-pie.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- quagga-0.98.5-pie.patch 20 Oct 2005 03:17:04 -0000 1.2
+++ quagga-0.98.5-pie.patch 20 Oct 2005 14:41:29 -0000 1.3
@@ -18,312 +18,3 @@
else
command="$base_compile $srcfile $pic_flag"
fi
---- quagga-0.98.5/makefiles.diff 2005-10-19 23:09:23.000000000 -0400
-+++ quagga-0.98.5.sav/makefiles.diff 2005-10-19 23:08:33.000000000 -0400
-@@ -0,0 +1,306 @@
-+--- quagga-0.98.5/Makefile 2005-10-19 22:57:47.000000000 -0400
-++++ quagga-0.98.5.sav/Makefile 2005-10-19 22:41:06.000000000 -0400
-+@@ -112,7 +112,7 @@
-+ ISISD =
-+ KERNEL_METHOD =
-+ LD = /usr/bin/ld -m elf_x86_64
-+-LDFLAGS =
-++LDFLAGS = -pie
-+ LIBCAP = -lcap
-+ LIBOBJS =
-+ LIBPAM = -lpam -lpam_misc
-+--- quagga-0.98.5/bgpd/Makefile 2005-10-19 23:05:37.000000000 -0400
-++++ quagga-0.98.5.sav/bgpd/Makefile 2005-10-19 23:07:12.000000000 -0400
-+@@ -86,7 +86,7 @@
-+ depcomp = $(SHELL) $(top_srcdir)/depcomp
-+ am__depfiles_maybe = depfiles
-+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -fPIE
-+ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+ $(AM_CFLAGS) $(CFLAGS)
-+@@ -145,7 +145,7 @@
-+ ISISD =
-+ KERNEL_METHOD =
-+ LD = /usr/bin/ld -m elf_x86_64
-+-LDFLAGS =
-++LDFLAGS = -pie
-+ LIBCAP = -lcap
-+ LIBOBJS =
-+ LIBPAM = -lpam -lpam_misc
-+--- quagga-0.98.5/doc/Makefile 2005-10-19 23:05:37.000000000 -0400
-++++ quagga-0.98.5.sav/doc/Makefile 2005-10-19 23:07:30.000000000 -0400
-+@@ -109,7 +109,7 @@
-+ ISISD =
-+ KERNEL_METHOD =
-+ LD = /usr/bin/ld -m elf_x86_64
-+-LDFLAGS =
-++LDFLAGS = -pie
-+ LIBCAP = -lcap
-+ LIBOBJS =
-+ LIBPAM = -lpam -lpam_misc
-+--- quagga-0.98.5/isisd/Makefile 2005-10-19 23:05:37.000000000 -0400
-++++ quagga-0.98.5.sav/isisd/Makefile 2005-10-19 23:07:33.000000000 -0400
-+@@ -84,7 +84,7 @@
-+ depcomp = $(SHELL) $(top_srcdir)/depcomp
-+ am__depfiles_maybe = depfiles
-+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -fPIE
-+ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+ $(AM_CFLAGS) $(CFLAGS)
-+@@ -145,7 +145,7 @@
-+ ISISD =
-+ KERNEL_METHOD =
-+ LD = /usr/bin/ld -m elf_x86_64
-+-LDFLAGS =
-++LDFLAGS = -pie
-+ LIBCAP = -lcap
-+ LIBOBJS =
-+ LIBPAM = -lpam -lpam_misc
-+--- quagga-0.98.5/lib/Makefile 2005-10-19 23:05:37.000000000 -0400
-++++ quagga-0.98.5.sav/lib/Makefile 2005-10-19 23:07:37.000000000 -0400
-+@@ -70,7 +70,7 @@
-+ depcomp = $(SHELL) $(top_srcdir)/depcomp
-+ am__depfiles_maybe = depfiles
-+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -fPIE
-+ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+ $(AM_CFLAGS) $(CFLAGS)
-+@@ -122,7 +122,7 @@
-+ ISISD =
-+ KERNEL_METHOD =
-+ LD = /usr/bin/ld -m elf_x86_64
-+-LDFLAGS =
-++LDFLAGS = -pie
-+ LIBCAP = -lcap
-+ LIBOBJS =
-+ LIBPAM = -lpam -lpam_misc
-+--- quagga-0.98.5/m4/Makefile 2005-10-19 23:05:37.000000000 -0400
-++++ quagga-0.98.5.sav/m4/Makefile 2005-10-19 23:07:40.000000000 -0400
-+@@ -88,7 +88,7 @@
-+ ISISD =
-+ KERNEL_METHOD =
-+ LD = /usr/bin/ld -m elf_x86_64
-+-LDFLAGS =
-++LDFLAGS = -pie
-+ LIBCAP = -lcap
-+ LIBOBJS =
-+ LIBPAM = -lpam -lpam_misc
-+--- quagga-0.98.5/ospf6d/Makefile 2005-10-19 23:05:37.000000000 -0400
-++++ quagga-0.98.5.sav/ospf6d/Makefile 2005-10-19 23:07:42.000000000 -0400
-+@@ -84,7 +84,7 @@
-+ depcomp = $(SHELL) $(top_srcdir)/depcomp
-+ am__depfiles_maybe = depfiles
-+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -fPIE
-+ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+ $(AM_CFLAGS) $(CFLAGS)
-+@@ -143,7 +143,7 @@
-+ ISISD =
-+ KERNEL_METHOD =
-+ LD = /usr/bin/ld -m elf_x86_64
-+-LDFLAGS =
-++LDFLAGS = -pie
-+ LIBCAP = -lcap
-+ LIBOBJS =
-+ LIBPAM = -lpam -lpam_misc
-+--- quagga-0.98.5/ospfclient/Makefile 2005-10-19 23:05:37.000000000 -0400
-++++ quagga-0.98.5.sav/ospfclient/Makefile 2005-10-19 23:07:44.000000000 -0400
-+@@ -75,7 +75,7 @@
-+ depcomp = $(SHELL) $(top_srcdir)/depcomp
-+ am__depfiles_maybe = depfiles
-+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -fPIE
-+ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+ $(AM_CFLAGS) $(CFLAGS)
-+@@ -127,7 +127,7 @@
-+ ISISD =
-+ KERNEL_METHOD =
-+ LD = /usr/bin/ld -m elf_x86_64
-+-LDFLAGS =
-++LDFLAGS = -pie
-+ LIBCAP = -lcap
-+ LIBOBJS =
-+ LIBPAM = -lpam -lpam_misc
-+--- quagga-0.98.5/ospfd/Makefile 2005-10-19 23:05:37.000000000 -0400
-++++ quagga-0.98.5.sav/ospfd/Makefile 2005-10-19 23:07:46.000000000 -0400
-+@@ -82,7 +82,7 @@
-+ depcomp = $(SHELL) $(top_srcdir)/depcomp
-+ am__depfiles_maybe = depfiles
-+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -fPIE
-+ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+ $(AM_CFLAGS) $(CFLAGS)
-+@@ -136,7 +136,7 @@
-+ ISISD =
-+ KERNEL_METHOD =
-+ LD = /usr/bin/ld -m elf_x86_64
-+-LDFLAGS =
-++LDFLAGS = -pie
-+ LIBCAP = -lcap
-+ LIBOBJS =
-+ LIBPAM = -lpam -lpam_misc
-+--- quagga-0.98.5/pkgsrc/Makefile 2005-10-19 23:05:37.000000000 -0400
-++++ quagga-0.98.5.sav/pkgsrc/Makefile 2005-10-19 23:07:48.000000000 -0400
-+@@ -96,7 +96,7 @@
-+ ISISD =
-+ KERNEL_METHOD =
-+ LD = /usr/bin/ld -m elf_x86_64
-+-LDFLAGS =
-++LDFLAGS = -pie
-+ LIBCAP = -lcap
-+ LIBOBJS =
-+ LIBPAM = -lpam -lpam_misc
-+--- quagga-0.98.5/redhat/Makefile 2005-10-19 23:05:37.000000000 -0400
-++++ quagga-0.98.5.sav/redhat/Makefile 2005-10-19 23:07:52.000000000 -0400
-+@@ -89,7 +89,7 @@
-+ ISISD =
-+ KERNEL_METHOD =
-+ LD = /usr/bin/ld -m elf_x86_64
-+-LDFLAGS =
-++LDFLAGS = -pie
-+ LIBCAP = -lcap
-+ LIBOBJS =
-+ LIBPAM = -lpam -lpam_misc
-+--- quagga-0.98.5/ripd/Makefile 2005-10-19 23:05:37.000000000 -0400
-++++ quagga-0.98.5.sav/ripd/Makefile 2005-10-19 23:07:54.000000000 -0400
-+@@ -74,7 +74,7 @@
-+ depcomp = $(SHELL) $(top_srcdir)/depcomp
-+ am__depfiles_maybe = depfiles
-+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -fPIE
-+ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+ $(AM_CFLAGS) $(CFLAGS)
-+@@ -133,7 +133,7 @@
-+ ISISD =
-+ KERNEL_METHOD =
-+ LD = /usr/bin/ld -m elf_x86_64
-+-LDFLAGS =
-++LDFLAGS = -pie
-+ LIBCAP = -lcap
-+ LIBOBJS =
-+ LIBPAM = -lpam -lpam_misc
-+--- quagga-0.98.5/ripngd/Makefile 2005-10-19 23:05:37.000000000 -0400
-++++ quagga-0.98.5.sav/ripngd/Makefile 2005-10-19 23:07:56.000000000 -0400
-+@@ -78,7 +78,7 @@
-+ depcomp = $(SHELL) $(top_srcdir)/depcomp
-+ am__depfiles_maybe = depfiles
-+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -fPIE
-+ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+ $(AM_CFLAGS) $(CFLAGS)
-+@@ -137,7 +137,7 @@
-+ ISISD =
-+ KERNEL_METHOD =
-+ LD = /usr/bin/ld -m elf_x86_64
-+-LDFLAGS =
-++LDFLAGS = -pie
-+ LIBCAP = -lcap
-+ LIBOBJS =
-+ LIBPAM = -lpam -lpam_misc
-+--- quagga-0.98.5/solaris/Makefile 2005-10-19 23:05:38.000000000 -0400
-++++ quagga-0.98.5.sav/solaris/Makefile 2005-10-19 23:07:58.000000000 -0400
-+@@ -91,7 +91,7 @@
-+ ISISD =
-+ KERNEL_METHOD =
-+ LD = /usr/bin/ld -m elf_x86_64
-+-LDFLAGS =
-++LDFLAGS = -pie
-+ LIBCAP = -lcap
-+ LIBOBJS =
-+ LIBPAM = -lpam -lpam_misc
-+--- quagga-0.98.5/tests/Makefile 2005-10-19 23:05:37.000000000 -0400
-++++ quagga-0.98.5.sav/tests/Makefile 2005-10-19 23:08:00.000000000 -0400
-+@@ -57,7 +57,7 @@
-+ depcomp = $(SHELL) $(top_srcdir)/depcomp
-+ am__depfiles_maybe = depfiles
-+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -fPIE
-+ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+ $(AM_CFLAGS) $(CFLAGS)
-+@@ -107,7 +107,7 @@
-+ ISISD =
-+ KERNEL_METHOD =
-+ LD = /usr/bin/ld -m elf_x86_64
-+-LDFLAGS =
-++LDFLAGS = -pie
-+ LIBCAP = -lcap
-+ LIBOBJS =
-+ LIBPAM = -lpam -lpam_misc
-+--- quagga-0.98.5/vtysh/Makefile 2005-10-19 23:05:37.000000000 -0400
-++++ quagga-0.98.5.sav/vtysh/Makefile 2005-10-19 23:08:03.000000000 -0400
-+@@ -65,7 +65,7 @@
-+ depcomp = $(SHELL) $(top_srcdir)/depcomp
-+ am__depfiles_maybe = depfiles
-+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -fPIE
-+ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+ $(AM_CFLAGS) $(CFLAGS)
-+@@ -124,7 +124,7 @@
-+ ISISD =
-+ KERNEL_METHOD =
-+ LD = /usr/bin/ld -m elf_x86_64
-+-LDFLAGS =
-++LDFLAGS = -pie
-+ LIBCAP = -lcap
-+ LIBOBJS =
-+ LIBPAM = -lpam -lpam_misc
-+--- quagga-0.98.5/watchquagga/Makefile 2005-10-19 23:05:37.000000000 -0400
-++++ quagga-0.98.5.sav/watchquagga/Makefile 2005-10-19 23:08:05.000000000 -0400
-+@@ -59,7 +59,7 @@
-+ depcomp = $(SHELL) $(top_srcdir)/depcomp
-+ am__depfiles_maybe = depfiles
-+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -fPIE
-+ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+ $(AM_CFLAGS) $(CFLAGS)
-+@@ -109,7 +109,7 @@
-+ ISISD =
-+ KERNEL_METHOD =
-+ LD = /usr/bin/ld -m elf_x86_64
-+-LDFLAGS =
-++LDFLAGS = -pie
-+ LIBCAP = -lcap
-+ LIBOBJS =
-+ LIBPAM = -lpam -lpam_misc
-+--- quagga-0.98.5/zebra/Makefile 2005-10-19 23:05:37.000000000 -0400
-++++ quagga-0.98.5.sav/zebra/Makefile 2005-10-19 23:08:07.000000000 -0400
-+@@ -71,7 +71,7 @@
-+ depcomp = $(SHELL) $(top_srcdir)/depcomp
-+ am__depfiles_maybe = depfiles
-+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -fPIE
-+ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+ $(AM_CFLAGS) $(CFLAGS)
-+@@ -130,7 +130,7 @@
-+ ISISD =
-+ KERNEL_METHOD =
-+ LD = /usr/bin/ld -m elf_x86_64
-+-LDFLAGS =
-++LDFLAGS = -pie
-+ LIBCAP = -lcap
-+ LIBOBJS =
-+ LIBPAM = -lpam -lpam_misc
Index: quagga.spec
===================================================================
RCS file: /cvs/dist/rpms/quagga/devel/quagga.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- quagga.spec 20 Oct 2005 03:17:04 -0000 1.26
+++ quagga.spec 20 Oct 2005 14:41:29 -0000 1.27
@@ -159,7 +159,8 @@
%endif
--enable-netlink
-patch -p1 < makefiles.diff
+for X in Makefile */Makefile ; do perl -pe 's/^COMPILE \= \$\(CC\) /COMPILE = \$(CC) -fPIE /;s/^LDFLAGS = $/LDFLAGS = -pie/' < $X > $X.tmp ; mv $X.tmp $X ; done
+
make %{?_smp_mflags} MAKEINFO="makeinfo --no-split"
pushd doc
- Previous message (by thread): rpms/gnome-applets/devel gnome-applets.spec,1.87,1.88
- Next message (by thread): rpms/util-linux/devel util-linux-2.13-ipcs-shmax.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 sources, 1.16, 1.17 util-linux.spec, 1.90, 1.91 cramfs-1.1-blocksize_and_quiet.patch, 1.1, NONE cramfs-1.1-pagesize.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list