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

[rmh at alioth.debian.org]

Author: rmh
Date: 2013-06-18 22:56:05 +0000 (Tue, 18 Jun 2013)
New Revision: 4526

Added:
   trunk/freebsd-buildutils/debian/patches/config_ldflags.diff
Modified:
   trunk/freebsd-buildutils/debian/changelog
   trunk/freebsd-buildutils/debian/control
   trunk/freebsd-buildutils/debian/patches/series
   trunk/freebsd-buildutils/debian/rules
Log:
Add freebsd-config back. (Closes: #712633)

Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog	2013-06-18 19:10:24 UTC (rev 4525)
+++ trunk/freebsd-buildutils/debian/changelog	2013-06-18 22:56:05 UTC (rev 4526)
@@ -1,7 +1,11 @@
 freebsd-buildutils (10~svn237137-2) UNRELEASED; urgency=low
 
+  [ Guillem Jover ]
   * Switch to canonical Vcs URLs.
 
+  [ Robert Millan ]
+  * Add freebsd-config back. (Closes: #712633)
+
  -- Guillem Jover <guillem at debian.org>  Sat, 18 May 2013 22:14:56 +0200
 
 freebsd-buildutils (10~svn237137-1) experimental; urgency=low

Modified: trunk/freebsd-buildutils/debian/control
===================================================================
--- trunk/freebsd-buildutils/debian/control	2013-06-18 19:10:24 UTC (rev 4525)
+++ trunk/freebsd-buildutils/debian/control	2013-06-18 22:56:05 UTC (rev 4526)
@@ -8,6 +8,8 @@
  pkg-config,
  freebsd-glue,
  byacc (>= 20120115~),
+# for freebsd-config
+ libsbuf-dev,
 Vcs-Browser: http://anonscm.debian.org/viewvc/glibc-bsd/trunk/freebsd-buildutils/
 Vcs-Svn: svn://anonscm.debian.org/glibc-bsd/trunk/freebsd-buildutils/
 Standards-Version: 3.9.2

Added: trunk/freebsd-buildutils/debian/patches/config_ldflags.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/config_ldflags.diff	                        (rev 0)
+++ trunk/freebsd-buildutils/debian/patches/config_ldflags.diff	2013-06-18 22:56:05 UTC (rev 4526)
@@ -0,0 +1,11 @@
+--- a/src/usr.sbin/config/Makefile
++++ b/src/usr.sbin/config/Makefile
+@@ -14,6 +14,8 @@
+ DPADD=	${LIBL} ${LIBSBUF}
+ LDADD=	-ll -lsbuf
+ 
++LDADD+=	-lbsd
++
+ CLEANFILES+=	kernconf.c
+ 
+ mkmakefile.o: configvers.h

Modified: trunk/freebsd-buildutils/debian/patches/series
===================================================================
--- trunk/freebsd-buildutils/debian/patches/series	2013-06-18 19:10:24 UTC (rev 4525)
+++ trunk/freebsd-buildutils/debian/patches/series	2013-06-18 22:56:05 UTC (rev 4526)
@@ -19,3 +19,4 @@
 22_ld_as_needed.diff
 disable_wsystem_headers.diff
 nostrip.diff
+config_ldflags.diff

Modified: trunk/freebsd-buildutils/debian/rules
===================================================================
--- trunk/freebsd-buildutils/debian/rules	2013-06-18 19:10:24 UTC (rev 4525)
+++ trunk/freebsd-buildutils/debian/rules	2013-06-18 22:56:05 UTC (rev 4526)
@@ -73,6 +73,7 @@
 		usr.bin/mkdep \
 		usr.bin/brandelf \
 		usr.sbin/btxld \
+		usr.sbin/config \
 		usr.sbin/kgzip \
 		usr.sbin/mtree \
 	; do \
@@ -109,6 +110,9 @@
 	$(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.bin/file2c
 	$(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.bin/brandelf
 
+	PATH=$(CURDIR)/build-tree/src/usr.bin/file2c:$(PATH) \
+		$(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.sbin/config
+
 	touch build-stamp
 
 install: build
@@ -121,7 +125,7 @@
 	  $(PMAKE) -C $(CURDIR)/build-tree/src/usr.bin/$$i install \
 		DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/lib/freebsd ; \
 	done
-	for i in mtree ; do \
+	for i in mtree config ; do \
 	  $(PMAKE) -C $(CURDIR)/build-tree/src/usr.sbin/$$i install \
 		DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/lib/freebsd ; \
 	done