Author: rmh
Date: 2006-02-10 20:21:53 +0000 (Fri, 10 Feb 2006)
New Revision: 1161
Removed:
trunk/freebsd6-buildutils/debian/patches/11_config_allow_override.diff
Modified:
trunk/freebsd6-buildutils/debian/patches/03_glibc.diff
trunk/freebsd6-buildutils/debian/rules
Log:
Apply "s/^LDADD=/LDADD+=/g" automaticaly.
Modified: trunk/freebsd6-buildutils/debian/patches/03_glibc.diff
===================================================================
--- trunk/freebsd6-buildutils/debian/patches/03_glibc.diff 2006-02-10
20:17:11 UTC (rev 1160)
+++ trunk/freebsd6-buildutils/debian/patches/03_glibc.diff 2006-02-10
20:21:53 UTC (rev 1161)
@@ -44,7 +44,7 @@
-CFLAGS+= -DMD5 -DSHA1 -DRMD160 -DSHA256
-DPADD= ${LIBMD}
--LDADD= -lmd
+-LDADD+= -lmd
-
.include <bsd.prog.mk>
diff -ur ../foo.old/src/usr.sbin/mtree/compare.c ./src/usr.sbin/mtree/compare.c
Deleted: trunk/freebsd6-buildutils/debian/patches/11_config_allow_override.diff
===================================================================
--- trunk/freebsd6-buildutils/debian/patches/11_config_allow_override.diff
2006-02-10 20:17:11 UTC (rev 1160)
+++ trunk/freebsd6-buildutils/debian/patches/11_config_allow_override.diff
2006-02-10 20:21:53 UTC (rev 1161)
@@ -1,11 +0,0 @@
---- src/usr.sbin/config/Makefile~ 2006-02-10 17:08:36.000000000 +0100
-+++ src/usr.sbin/config/Makefile 2006-02-10 17:10:54.000000000 +0100
-@@ -10,7 +10,7 @@
- CFLAGS+= -I. -I${.CURDIR}
-
- DPADD= ${LIBL}
--LDADD= -ll
-+LDADD+= -ll
-
- mkmakefile.o: configvers.h
-
Modified: trunk/freebsd6-buildutils/debian/rules
===================================================================
--- trunk/freebsd6-buildutils/debian/rules 2006-02-10 20:17:11 UTC (rev
1160)
+++ trunk/freebsd6-buildutils/debian/rules 2006-02-10 20:21:53 UTC (rev
1161)
@@ -24,7 +24,9 @@
mkdir build-tree
tar -C build-tree -xzf src.tar.gz
find build-tree -type d -name CVS | xargs rm -rf
- find build-tree -type f | (while read i ; do sed -i $$i -e
"/^__FBSDID/d" -e "s,<sys/queue.h>,<bsd/queue.h>,g" ; done)
+ find build-tree -type f | (while read i ; do sed -i $$i \
+ -e "/^__FBSDID/d" -e "s,<sys/queue.h>,<bsd/queue.h>,g" -e
"s/^LDADD=/LDADD+=/g" ; \
+ done)
set -e ; cd build-tree && \
for i in $(CURDIR)/debian/patches/*.diff ; do \
echo "--- Patch $$i ---" ; \
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
