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

[rmh at alioth.debian.org]

Author: rmh
Date: 2013-11-23 15:20:33 +0000 (So, 23 lis 2013)
New Revision: 5153

Added:
   trunk/freebsd-buildutils/debian/patches/aicasm.diff
Modified:
   trunk/freebsd-buildutils/debian/changelog
   trunk/freebsd-buildutils/debian/patches/series
   trunk/freebsd-buildutils/debian/rules
Log:
Add aicasm. It is now required by kernel builds.

Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog	2013-11-23 14:58:13 UTC (rev 5152)
+++ trunk/freebsd-buildutils/debian/changelog	2013-11-23 15:20:33 UTC (rev 5153)
@@ -2,6 +2,7 @@
 
   * New upstream snapshot.
     - Refresh all patches.
+    - Add aicasm. It is now required by kernel builds.
 
   [ Guillem Jover ]
   * Remove myself from Uploaders.

Added: trunk/freebsd-buildutils/debian/patches/aicasm.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/aicasm.diff	                        (rev 0)
+++ trunk/freebsd-buildutils/debian/patches/aicasm.diff	2013-11-23 15:20:33 UTC (rev 5153)
@@ -0,0 +1,16 @@
+
+Partially sent to freebsd-hackers (2011-07-02)
+
+--- a/src/sys/dev/aic7xxx/aicasm/Makefile
++++ b/src/sys/dev/aic7xxx/aicasm/Makefile
+@@ -24,6 +24,10 @@
+ DEPENDFILE=	.depend_aicasm
+ .endif
+ 
++NO_WERROR?=	1
++LDADD+=		-ldb -lbsd
++CFLAGS+=	-D_GNU_SOURCE -isystem /usr/include/freebsd
++
+ CFLAGS+= -I${.CURDIR}
+ .ifdef MAKESRCPATH
+ CFLAGS+= -I${MAKESRCPATH}

Modified: trunk/freebsd-buildutils/debian/patches/series
===================================================================
--- trunk/freebsd-buildutils/debian/patches/series	2013-11-23 14:58:13 UTC (rev 5152)
+++ trunk/freebsd-buildutils/debian/patches/series	2013-11-23 15:20:33 UTC (rev 5153)
@@ -4,7 +4,7 @@
 mk_ncp.diff
 yacc_is_byacc.diff
 
-# Other patches
+# Other patches that might or might not be mergeable
 00_upstream.diff
 01_make_fixes.diff
 03_glibc.diff
@@ -20,3 +20,6 @@
 disable_wsystem_headers.diff
 nostrip.diff
 config_ldflags.diff
+
+# Patches that are likely to be Debian-specific
+aicasm.diff

Modified: trunk/freebsd-buildutils/debian/rules
===================================================================
--- trunk/freebsd-buildutils/debian/rules	2013-11-23 14:58:13 UTC (rev 5152)
+++ trunk/freebsd-buildutils/debian/rules	2013-11-23 15:20:33 UTC (rev 5153)
@@ -78,6 +78,7 @@
 		usr.sbin/config \
 		usr.sbin/kgzip \
 		usr.sbin/mtree \
+		sys/dev/aic7xxx/aicasm \
 	; do \
 		svn export -r $(svn_revision) $(SVN)/$$i $(ORIGDIR)/src/$$i ; \
 	done
@@ -110,6 +111,7 @@
 	$(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.sbin/mtree
 	$(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
 
 	PATH=$(CURDIR)/build-tree/src/usr.bin/file2c:$(PATH) \
 		$(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.sbin/config
@@ -133,6 +135,9 @@
 	$(PMAKE) -C build-tree/src/share/mk install \
 		DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/share
 
+	$(PMAKE) -C build-tree/src/sys/dev/aic7xxx/aicasm install \
+		DESTDIR=$(CURDIR)/debian/$(package)
+
 	# 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