[Glibc-bsd-commits] r5497 - in branches/experimental/kfreebsd-10/debian: . patches

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2014-08-24 20:35:13 +0000 (Sun, 24 Aug 2014)
New Revision: 5497

Added:
   branches/experimental/kfreebsd-10/debian/patches/003_glibc_dev_aicasm.diff
Modified:
   branches/experimental/kfreebsd-10/debian/changelog
   branches/experimental/kfreebsd-10/debian/patches/series
Log:
Revert r5496;  back-track to snapshot of upstream r270273 and we'll come
back to aic7xxx build issues later


Modified: branches/experimental/kfreebsd-10/debian/changelog
===================================================================
--- branches/experimental/kfreebsd-10/debian/changelog	2014-08-24 19:47:25 UTC (rev 5496)
+++ branches/experimental/kfreebsd-10/debian/changelog	2014-08-24 20:35:13 UTC (rev 5497)
@@ -1,4 +1,4 @@
-kfreebsd-10 (10.1~svn270484-1) UNRELEASED; urgency=low
+kfreebsd-10 (10.1~svn270273-1) UNRELEASED; urgency=low
 
   [ Steven Chamberlain ]
   * New upstream snapshot of STABLE-10
@@ -13,7 +13,6 @@
     - SA-14_08.tcp.patch
     - EN-14_05.ciss.patch
     - EN-14_06.execve.patch
-    - 003_glibc_dev_aicasm.diff
   * Refresh patches:
     - radeonkms_abort_nofw.diff
     - userland.diff

Added: branches/experimental/kfreebsd-10/debian/patches/003_glibc_dev_aicasm.diff
===================================================================
--- branches/experimental/kfreebsd-10/debian/patches/003_glibc_dev_aicasm.diff	                        (rev 0)
+++ branches/experimental/kfreebsd-10/debian/patches/003_glibc_dev_aicasm.diff	2014-08-24 20:35:13 UTC (rev 5497)
@@ -0,0 +1,23 @@
+
+Partially sent to freebsd-hackers (2011-07-02)
+
+--- a/sys/dev/aic7xxx/aicasm/Makefile
++++ b/sys/dev/aic7xxx/aicasm/Makefile
+@@ -16,6 +16,9 @@
+ DPADD=	${LIBL}
+ LDADD=	-ll
+ WARNS?=	5
++NO_WERROR?=	1
++LDADD+= -ldb -lbsd
++CFLAGS+= -D_GNU_SOURCE -isystem /usr/include/freebsd
+ 
+ # Correct path for kernel builds
+ # Don't rely on the kernel's .depend file
+@@ -24,7 +27,6 @@
+ DEPENDFILE=	.depend_aicasm
+ .endif
+ 
+-CFLAGS+= -I.
+ .ifdef MAKESRCPATH
+ CFLAGS+= -I${MAKESRCPATH}
+ .endif

Modified: branches/experimental/kfreebsd-10/debian/patches/series
===================================================================
--- branches/experimental/kfreebsd-10/debian/patches/series	2014-08-24 19:47:25 UTC (rev 5496)
+++ branches/experimental/kfreebsd-10/debian/patches/series	2014-08-24 20:35:13 UTC (rev 5497)
@@ -8,6 +8,7 @@
 userland.diff
 001_misc.diff
 002_maxpathlen.diff
+003_glibc_dev_aicasm.diff
 004_xargs.diff
 #007_clone_signals.diff
 #009_disable_duped_modules.diff