diff options
| author | Zhiquan Li <zhiquan.li@windriver.com> | 2015-11-16 10:23:00 +0800 |
|---|---|---|
| committer | Joe MacDonald <joe_macdonald@mentor.com> | 2015-11-30 13:00:15 -0500 |
| commit | 49fa307d479376ce8404d24c6d6d7142dcd941fb (patch) | |
| tree | 20d1d22ac899e8af1b621e5793e834d440399aee /meta-networking/recipes-connectivity/daq/files/disable-run-test-program-while-cross-compiling.patch | |
| parent | 20b63d32bce7e09a72e945313717702201b6484d (diff) | |
| download | meta-openembedded-49fa307d479376ce8404d24c6d6d7142dcd941fb.tar.gz | |
snort: 2.9.6.0 -> 2.9.7.5
Upgrade snort from 2.9.6.0 to 2.9.7.5, as its dependency upgrade daq from
2.0.2 to 2.0.6, and accordingly update the patches:
* Add 2 new patches for snort to solve the cross compile issues
* Discard 2 snort patches since it is not needed
* Refresh the patch for daq new version
* Remove redundant '/' to getting round the rpm debugedit bug:
canonicalization unexpectedly shrank character
Signed-off-by: Zhiquan Li <zhiquan.li@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking/recipes-connectivity/daq/files/disable-run-test-program-while-cross-compiling.patch')
| -rw-r--r-- | meta-networking/recipes-connectivity/daq/files/disable-run-test-program-while-cross-compiling.patch | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/meta-networking/recipes-connectivity/daq/files/disable-run-test-program-while-cross-compiling.patch b/meta-networking/recipes-connectivity/daq/files/disable-run-test-program-while-cross-compiling.patch index 12a6cba600..a100b7cb83 100644 --- a/meta-networking/recipes-connectivity/daq/files/disable-run-test-program-while-cross-compiling.patch +++ b/meta-networking/recipes-connectivity/daq/files/disable-run-test-program-while-cross-compiling.patch | |||
| @@ -5,12 +5,13 @@ configure: error: cannot run test program while cross compiling | |||
| 5 | 5 | ||
| 6 | Signed-off-by: Chunrong Guo <B40290@freescale.com> | 6 | Signed-off-by: Chunrong Guo <B40290@freescale.com> |
| 7 | 7 | ||
| 8 | --- a/m4/sf.m4old 2013-08-30 04:08:18.768409680 -0500 | 8 | --- a/m4/sf.m4old 2015-10-28 10:21:20.270557986 +0800 |
| 9 | +++ b/m4/sf.m4 2013-08-30 04:09:24.591367890 -0500 | 9 | +++ a/m4/sf.m4 2015-10-28 10:23:22.726551974 +0800 |
| 10 | @@ -135,19 +135,6 @@ | 10 | @@ -135,20 +135,7 @@ |
| 11 | echo | ||
| 11 | exit 1 | 12 | exit 1 |
| 12 | fi | 13 | fi |
| 13 | AC_MSG_CHECKING([for libpcap version >= $1]) | 14 | - AC_CACHE_CHECK([for libpcap version >= $1], [daq_cv_libpcap_version_1x], [ |
| 14 | - AC_RUN_IFELSE( | 15 | - AC_RUN_IFELSE( |
| 15 | - [AC_LANG_PROGRAM( | 16 | - [AC_LANG_PROGRAM( |
| 16 | - [[ | 17 | - [[ |
| @@ -22,8 +23,9 @@ Signed-off-by: Chunrong Guo <B40290@freescale.com> | |||
| 22 | - if (strcmp(pcap_version, $1) < 0) | 23 | - if (strcmp(pcap_version, $1) < 0) |
| 23 | - return 1; | 24 | - return 1; |
| 24 | - ]])], | 25 | - ]])], |
| 25 | - [libpcap_version_1x="yes"], | 26 | - [daq_cv_libpcap_version_1x="yes"], |
| 26 | - [libpcap_version_1x="no"]) | 27 | - [daq_cv_libpcap_version_1x="no"])]) |
| 27 | if test "x$libpcap_version_1x" = "xno"; then | 28 | + AC_CACHE_CHECK([for libpcap version >= $1], [daq_cv_libpcap_version_1x]) |
| 28 | AC_MSG_RESULT(no) | 29 | if test "x$daq_cv_libpcap_version_1x" = "xno"; then |
| 29 | echo | 30 | echo |
| 31 | echo " ERROR! Libpcap library version >= $1 not found." | ||