[Glibc-bsd-commits] r3705 - in trunk/freebsd-buildutils/debian: . patches

[Robert Millan]

Author: rmh
Date: 2011-09-19 17:43:18 +0000 (Mon, 19 Sep 2011)
New Revision: 3705

Added:
   trunk/freebsd-buildutils/debian/patches/22_ld_as_needed.diff
Modified:
   trunk/freebsd-buildutils/debian/changelog
   trunk/freebsd-buildutils/debian/patches/series
   trunk/freebsd-buildutils/debian/rules
Log:
  [ Matthias Klose ]
  * Fix FTBFS with ld --as-needed.  (Closes: #642091, LP: #749170)

Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog	2011-09-18 15:23:59 UTC (rev 3704)
+++ trunk/freebsd-buildutils/debian/changelog	2011-09-19 17:43:18 UTC (rev 3705)
@@ -1,3 +1,10 @@
+freebsd-buildutils (8.2-8) UNRELEASED; urgency=low
+
+  [ Matthias Klose ]
+  * Fix FTBFS with ld --as-needed.  (Closes: #642091, LP: #749170)
+
+ -- Robert Millan <rmh at debian.org>  Mon, 19 Sep 2011 19:41:19 +0200
+
 freebsd-buildutils (8.2-7) unstable; urgency=low
 
   * 04_lex_disable_unused.diff: Fix generation of code in lex, which

Added: trunk/freebsd-buildutils/debian/patches/22_ld_as_needed.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/22_ld_as_needed.diff	                        (rev 0)
+++ trunk/freebsd-buildutils/debian/patches/22_ld_as_needed.diff	2011-09-19 17:43:18 UTC (rev 3705)
@@ -0,0 +1,20 @@
+--- freebsd-buildutils-8.2.orig/src/usr.bin/make/Makefile
++++ freebsd-buildutils-8.2/src/usr.bin/make/Makefile
+@@ -4,6 +4,7 @@
+ 
+ PROG=	make
+ CFLAGS+=-I${.CURDIR}
++LDADD+=-lbsd
+ SRCS=	arch.c buf.c cond.c dir.c for.c hash.c hash_tables.c job.c	\
+ 	lst.c main.c make.c parse.c proc.c shell.c str.c suff.c targ.c	\
+ 	util.c var.c
+--- freebsd-buildutils-8.2.orig/src/usr.sbin/mtree/Makefile
++++ freebsd-buildutils-8.2/src/usr.sbin/mtree/Makefile
+@@ -7,6 +7,7 @@ PROG=	mtree
+ MAN=	mtree.8 mtree.5
+ SRCS=	compare.c crc.c create.c excludes.c misc.c mtree.c spec.c verify.c
+ SRCS+=	specspec.c
++LDADD+=	-lbsd
+ 
+ WARNS?=	4
+ 

Modified: trunk/freebsd-buildutils/debian/patches/series
===================================================================
--- trunk/freebsd-buildutils/debian/patches/series	2011-09-18 15:23:59 UTC (rev 3704)
+++ trunk/freebsd-buildutils/debian/patches/series	2011-09-19 17:43:18 UTC (rev 3705)
@@ -15,3 +15,4 @@
 19_fix_cmd_pathnames.diff
 20_libbsd_overlay.diff
 21_endian.diff
+22_ld_as_needed.diff

Modified: trunk/freebsd-buildutils/debian/rules
===================================================================
--- trunk/freebsd-buildutils/debian/rules	2011-09-18 15:23:59 UTC (rev 3704)
+++ trunk/freebsd-buildutils/debian/rules	2011-09-19 17:43:18 UTC (rev 3705)
@@ -42,7 +42,7 @@
 CFLAGS = -O2 -g -Wall -D_GNU_SOURCE \
          -DMACHINE_ARCH='"$(MACHINE_ARCH)"' \
          -DMACHINE_MULTIARCH='"$(MACHINE_MULTIARCH)"' \
-         -I$(CURDIR)/build-tree/src/sys -lbsd \
+         -I$(CURDIR)/build-tree/src/sys \
 	 -D'__FBSDID(string)='
 # disabled due to #630907 (see also 20_libbsd_overlay.diff)
 # $(shell pkg-config --cflags libbsd-overlay)