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

[rmh at alioth.debian.org]

Author: rmh
Date: 2013-12-17 21:45:27 +0000 (Tue, 17 Dec 2013)
New Revision: 5239

Added:
   trunk/freebsd-buildutils/debian/patches/makefiles.diff
Modified:
   trunk/freebsd-buildutils/debian/changelog
   trunk/freebsd-buildutils/debian/patches/aicasm.diff
   trunk/freebsd-buildutils/debian/patches/series
   trunk/freebsd-buildutils/debian/rules
Log:
  * New upstream snapshot (10.0-RC2).
    - Switch to releng/10.0 branch.
    - Add kldxref.

Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog	2013-12-17 21:25:24 UTC (rev 5238)
+++ trunk/freebsd-buildutils/debian/changelog	2013-12-17 21:45:27 UTC (rev 5239)
@@ -1,8 +1,13 @@
-freebsd-buildutils (10~svn258496-2) UNRELEASED; urgency=low
+freebsd-buildutils (10.0~svn259404-1) UNRELEASED; urgency=low
 
+  * New upstream snapshot (10.0-RC2).
+    - Switch to releng/10.0 branch.
+    - Add kldxref.
+
+  [ Robert Millan ]
   * Fetch source code securely (https) in get-orig-source.
 
- -- Robert Millan <rmh at debian.org>  Sat, 07 Dec 2013 23:22:59 +0100
+ -- Robert Millan <rmh at debian.org>  Tue, 17 Dec 2013 22:28:15 +0100
 
 freebsd-buildutils (10~svn258496-1) unstable; urgency=low
 

Modified: trunk/freebsd-buildutils/debian/patches/aicasm.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/aicasm.diff	2013-12-17 21:25:24 UTC (rev 5238)
+++ trunk/freebsd-buildutils/debian/patches/aicasm.diff	2013-12-17 21:45:27 UTC (rev 5239)
@@ -11,6 +11,6 @@
 +LDADD+=		-ldb -lbsd
 +CFLAGS+=	-D_GNU_SOURCE -isystem /usr/include/freebsd
 +
- CFLAGS+= -I${.CURDIR}
+ CFLAGS+= -I.
  .ifdef MAKESRCPATH
  CFLAGS+= -I${MAKESRCPATH}

Added: trunk/freebsd-buildutils/debian/patches/makefiles.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/makefiles.diff	                        (rev 0)
+++ trunk/freebsd-buildutils/debian/patches/makefiles.diff	2013-12-17 21:45:27 UTC (rev 5239)
@@ -0,0 +1,11 @@
+--- a/src/usr.sbin/kldxref/Makefile
++++ b/src/usr.sbin/kldxref/Makefile
+@@ -7,6 +7,8 @@
+ WARNS?=	2
+ CFLAGS+=-fno-strict-aliasing
+ 
++LDADD+=	-lbsd
++
+ .if exists(ef_${MACHINE_CPUARCH}.c) && ${MACHINE_ARCH} != "powerpc64"
+ SRCS+=	ef_${MACHINE_CPUARCH}.c
+ .else

Modified: trunk/freebsd-buildutils/debian/patches/series
===================================================================
--- trunk/freebsd-buildutils/debian/patches/series	2013-12-17 21:25:24 UTC (rev 5238)
+++ trunk/freebsd-buildutils/debian/patches/series	2013-12-17 21:45:27 UTC (rev 5239)
@@ -23,3 +23,4 @@
 
 # Patches that are likely to be Debian-specific
 aicasm.diff
+makefiles.diff

Modified: trunk/freebsd-buildutils/debian/rules
===================================================================
--- trunk/freebsd-buildutils/debian/rules	2013-12-17 21:25:24 UTC (rev 5238)
+++ trunk/freebsd-buildutils/debian/rules	2013-12-17 21:45:27 UTC (rev 5239)
@@ -37,9 +37,9 @@
 revision	:= $(shell echo $(full_version) | sed -e 's/^[^+-]*//g')
 
 #SVN		:= https://svn0.us-west.freebsd.org/base/release/$(version).0
-#SVN		:= https://svn0.us-west.freebsd.org/base/releng/$(version)
+SVN		:= https://svn0.us-west.freebsd.org/base/releng/$(version)
 #SVN		:= https://svn0.us-west.freebsd.org/base/stable/$(major)
-SVN		:= https://svn0.us-west.freebsd.org/base/head
+#SVN		:= https://svn0.us-west.freebsd.org/base/head
 
 SOURCE = freebsd-buildutils
 ORIGDIR = $(SOURCE)-$(tar_version)
@@ -77,6 +77,7 @@
 		usr.sbin/btxld \
 		usr.sbin/config \
 		usr.sbin/kgzip \
+		usr.sbin/kldxref \
 		usr.sbin/mtree \
 		sys/dev/aic7xxx/aicasm \
 	; do \
@@ -112,6 +113,7 @@
 	$(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.bin/file2c
 	$(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.bin/brandelf
 	$(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/sys/dev/aic7xxx/aicasm
+	$(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.sbin/kldxref
 
 	PATH=$(CURDIR)/build-tree/src/usr.bin/file2c:$(PATH) \
 		$(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.sbin/config
@@ -138,6 +140,9 @@
 	$(PMAKE) -C build-tree/src/sys/dev/aic7xxx/aicasm install \
 		DESTDIR=$(CURDIR)/debian/$(package)
 
+	$(PMAKE) -C build-tree/src/usr.sbin/kldxref install \
+		DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/bin
+
 	# Legacy make is now called "fmake". FIXME: I guess we'll need to point this
 	# symlink to "bmake" at some point?
 	ln -s fmake $(CURDIR)/debian/$(package)/usr/lib/freebsd/make