opensaf: Upgrade to 5.18.02

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
This commit is contained in:
Khem Raj 2018-02-07 21:35:12 -08:00 committed by Joe MacDonald
parent 07e698cd46
commit 569c48ef5b
2 changed files with 17 additions and 21 deletions

View File

@ -11,10 +11,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
3 files changed, 79 insertions(+), 3 deletions(-) 3 files changed, 79 insertions(+), 3 deletions(-)
create mode 100644 m4/ax_check_compile_flag.m4 create mode 100644 m4/ax_check_compile_flag.m4
diff --git a/Makefile.am b/Makefile.am Index: opensaf-5.18.02/Makefile.am
index d63fbbb..1012a2c 100644 ===================================================================
--- a/Makefile.am --- opensaf-5.18.02.orig/Makefile.am
+++ b/Makefile.am +++ opensaf-5.18.02/Makefile.am
@@ -52,10 +52,10 @@ AM_CPPFLAGS = \ @@ -52,10 +52,10 @@ AM_CPPFLAGS = \
-pthread \ -pthread \
-D_GNU_SOURCE -DINTERNAL_VERSION_ID='"@INTERNAL_VERSION_ID@"' \ -D_GNU_SOURCE -DINTERNAL_VERSION_ID='"@INTERNAL_VERSION_ID@"' \
@ -26,14 +26,14 @@ index d63fbbb..1012a2c 100644
-AM_CXXFLAGS = -pipe -std=gnu++11 @OSAF_HARDEN_FLAGS@ -Wall -Wformat=2 -Werror -AM_CXXFLAGS = -pipe -std=gnu++11 @OSAF_HARDEN_FLAGS@ -Wall -Wformat=2 -Werror
+AM_CFLAGS = -pipe -std=gnu11 @OSAF_HARDEN_FLAGS@ -Wall -Wformat=2 -Werror @NOWARNINGS@ +AM_CFLAGS = -pipe -std=gnu11 @OSAF_HARDEN_FLAGS@ -Wall -Wformat=2 -Werror @NOWARNINGS@
+AM_CXXFLAGS = -pipe -std=gnu++11 @OSAF_HARDEN_FLAGS@ -Wall -Wformat=2 -Werror @NOWARNINGS@ +AM_CXXFLAGS = -pipe -std=gnu++11 @OSAF_HARDEN_FLAGS@ -Wall -Wformat=2 -Werror @NOWARNINGS@
AM_LDFLAGS = @OSAF_HARDEN_FLAGS@ -Wl,--as-needed -ldl -lrt -pthread -rdynamic
ACLOCAL_AMFLAGS = -I m4 if ENABLE_GCOV
OSAF_LIB_FLAGS = AM_CFLAGS += --coverage
diff --git a/configure.ac b/configure.ac Index: opensaf-5.18.02/configure.ac
index 02771c6..b76b0fe 100644 ===================================================================
--- a/configure.ac --- opensaf-5.18.02.orig/configure.ac
+++ b/configure.ac +++ opensaf-5.18.02/configure.ac
@@ -557,6 +557,8 @@ if test -z "$OSAF_HARDEN_FLAGS"; then @@ -593,6 +593,8 @@ if test -z "$OSAF_HARDEN_FLAGS"; then
fi fi
AC_SUBST(OSAF_HARDEN_FLAGS) AC_SUBST(OSAF_HARDEN_FLAGS)
@ -42,11 +42,10 @@ index 02771c6..b76b0fe 100644
############################################# #############################################
# List the output Makefiles # List the output Makefiles
############################################# #############################################
diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4 Index: opensaf-5.18.02/m4/ax_check_compile_flag.m4
new file mode 100644 ===================================================================
index 0000000..dcabb92
--- /dev/null --- /dev/null
+++ b/m4/ax_check_compile_flag.m4 +++ opensaf-5.18.02/m4/ax_check_compile_flag.m4
@@ -0,0 +1,74 @@ @@ -0,0 +1,74 @@
+# =========================================================================== +# ===========================================================================
+# https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html +# https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
@ -122,6 +121,3 @@ index 0000000..dcabb92
+ [m4_default([$3], :)]) + [m4_default([$3], :)])
+AS_VAR_POPDEF([CACHEVAR])dnl +AS_VAR_POPDEF([CACHEVAR])dnl
+])dnl AX_CHECK_COMPILE_FLAGS +])dnl AX_CHECK_COMPILE_FLAGS
--
2.12.2

View File

@ -25,8 +25,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/releases/${BPN}-${PV}.tar.gz \
file://0001-src-Add-missing-header-limits.h-for-_POSIX_HOST_NAME.patch \ file://0001-src-Add-missing-header-limits.h-for-_POSIX_HOST_NAME.patch \
file://0001-immpbe_dump.cc-Use-sys-wait.h-instead-of-wait.h.patch \ file://0001-immpbe_dump.cc-Use-sys-wait.h-instead-of-wait.h.patch \
" "
SRC_URI[md5sum] = "125bcd9aabd7412aedcbfbf73f4e6196" SRC_URI[md5sum] = "42064f5ddbc7f560bfc5ff93ea9eecc7"
SRC_URI[sha256sum] = "3fb2239bb2c9328c8b45368ff8d8de979ea286a27edc9871d218200e88bb91cc" SRC_URI[sha256sum] = "f9e24897f9cfd63bb3115f6275c706de1702d3d9bae2fc423227db72b23c37f0"
inherit autotools useradd systemd pkgconfig inherit autotools useradd systemd pkgconfig