| 1 |
vapier 14/06/03 16:54:59 |
| 2 |
|
| 3 |
Added: daq-2.0.2-libpcap-check.patch |
| 4 |
daq-2.0.2-parallel-grammar.patch |
| 5 |
Log: |
| 6 |
Fix parallel builds #511892 by eroen. Fix by Shawn Wallace for cross-compiling. |
| 7 |
|
| 8 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 net-libs/daq/files/daq-2.0.2-libpcap-check.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/daq/files/daq-2.0.2-libpcap-check.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/daq/files/daq-2.0.2-libpcap-check.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: daq-2.0.2-libpcap-check.patch |
| 17 |
=================================================================== |
| 18 |
fix the libpcap check so that people can set the cache version when cross-compiling |
| 19 |
|
| 20 |
patch by Shawn Wallace <sjwallace@××××××.com> |
| 21 |
|
| 22 |
--- a/m4/sf.m4 |
| 23 |
+++ b/m4/sf.m4 |
| 24 |
@@ -135,7 +135,7 @@ |
| 25 |
echo |
| 26 |
exit 1 |
| 27 |
fi |
| 28 |
- AC_MSG_CHECKING([for libpcap version >= $1]) |
| 29 |
+ AC_CACHE_CHECK([for libpcap version >= $1], [daq_cv_libpcap_version_1x], [ |
| 30 |
AC_RUN_IFELSE( |
| 31 |
[AC_LANG_PROGRAM( |
| 32 |
[[ |
| 33 |
@@ -147,16 +147,13 @@ |
| 34 |
if (strcmp(pcap_version, $1) < 0) |
| 35 |
return 1; |
| 36 |
]])], |
| 37 |
- [libpcap_version_1x="yes"], |
| 38 |
- [libpcap_version_1x="no"]) |
| 39 |
- if test "x$libpcap_version_1x" = "xno"; then |
| 40 |
- AC_MSG_RESULT(no) |
| 41 |
+ [daq_cv_libpcap_version_1x="yes"], |
| 42 |
+ [daq_cv_libpcap_version_1x="no"])]) |
| 43 |
+ if test "x$daq_cv_libpcap_version_1x" = "xno"; then |
| 44 |
echo |
| 45 |
echo " ERROR! Libpcap library version >= $1 not found." |
| 46 |
echo " Get it from http://www.tcpdump.org" |
| 47 |
echo |
| 48 |
exit 1 |
| 49 |
- else |
| 50 |
- AC_MSG_RESULT(yes) |
| 51 |
fi |
| 52 |
]) |
| 53 |
|
| 54 |
|
| 55 |
|
| 56 |
|
| 57 |
1.1 net-libs/daq/files/daq-2.0.2-parallel-grammar.patch |
| 58 |
|
| 59 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/daq/files/daq-2.0.2-parallel-grammar.patch?rev=1.1&view=markup |
| 60 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/daq/files/daq-2.0.2-parallel-grammar.patch?rev=1.1&content-type=text/plain |
| 61 |
|
| 62 |
Index: daq-2.0.2-parallel-grammar.patch |
| 63 |
=================================================================== |
| 64 |
https://bugs.gentoo.org/511892 |
| 65 |
|
| 66 |
the scanner needs the generated header file, so make sure it's listed as a |
| 67 |
dependency. else you see a failure: |
| 68 |
$ cd sfbpf |
| 69 |
$ make clean |
| 70 |
$ make sf_scanner.lo |
| 71 |
<missing tokdefs.h> |
| 72 |
we'd like to list it as a dep of the object, but automake can use generated |
| 73 |
file names, so it's not easy to list that. |
| 74 |
|
| 75 |
we can't have both of the outputs from grammar.y run the lex, otherwise we |
| 76 |
hit random parallel build failures: |
| 77 |
$ cd sfbpf |
| 78 |
$ make clean |
| 79 |
$ make tokdefs.h sf_grammar.c -j |
| 80 |
<run yacc twice & fail> |
| 81 |
|
| 82 |
--- a/sfbpf/Makefile.am |
| 83 |
+++ b/sfbpf/Makefile.am |
| 84 |
@@ -43,14 +43,16 @@ |
| 85 |
libsfbpf_la_LDFLAGS = -version-info 0:1:0 @XCCFLAGS@ |
| 86 |
|
| 87 |
# use of $@ and $< here is a GNU idiom that borks BSD |
| 88 |
-${builddir}/sf_scanner.c: ${srcdir}/scanner.l |
| 89 |
+${builddir}/sf_scanner.c: ${srcdir}/scanner.l ${builddir}/tokdefs.h |
| 90 |
@rm -f ${builddir}/sf_scanner.c |
| 91 |
${srcdir}/runlex.sh $(V_LEX) -osf_scanner.c ${srcdir}/scanner.l |
| 92 |
|
| 93 |
-${builddir}/tokdefs.h ${builddir}/sf_grammar.c: ${srcdir}/grammar.y |
| 94 |
+${builddir}/sf_grammar.c: ${srcdir}/grammar.y |
| 95 |
@rm -f ${builddir}/sf_grammar.c ${builddir}/tokdefs.h |
| 96 |
$(V_YACC) -d ${srcdir}/grammar.y |
| 97 |
mv y.tab.c sf_grammar.c |
| 98 |
mv y.tab.h tokdefs.h |
| 99 |
|
| 100 |
+${builddir}/tokdefs.h: ${builddir}/sf_grammar.c ; @true |
| 101 |
+ |
| 102 |
CLEANFILES = ${builddir}/sf_scanner.c ${builddir}/sf_grammar.c ${builddir}/tokdefs.h ${builddir}/sf_scanner.h |
Archives