diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-09-04 16:47:52 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-09-04 16:47:52 +0200 |
| commit | 0d30ace5d321ad2e4542e7437e7696aa2c1c04ac (patch) | |
| tree | cd32907c15373fd3923363d7929eb8573b390423 | |
| parent | e9a6b127d666825dd51c98aa680f42fde23929bd (diff) | |
| parent | 201b0766a4b418abeab97d09d090883a16b0e671 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | package/ltp/Makefile | 7 | ||||
| -rw-r--r-- | package/ltp/patches/0001-realtime-Fix-exp10-check.patch | 40 | ||||
| -rw-r--r-- | target/m68k/uclibc-nommu.config | 6 |
3 files changed, 48 insertions, 5 deletions
diff --git a/package/ltp/Makefile b/package/ltp/Makefile index 0268f15f9..d097f8fb9 100644 --- a/package/ltp/Makefile +++ b/package/ltp/Makefile @@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= ltp PKG_VERSION:= 20140828 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 6a98074e9121595ccb78951ebfeb698f PKG_DESCR:= linux test project PKG_DEPENDS:= bash libpthread librt @@ -22,7 +22,6 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,LTP,ltp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -TARGET_CFLAGS+= -fno-builtin XAKE_FLAGS+= GCC_HONOUR_COPTS=s CONFIGURE_ARGS+= --with-open-posix-testsuite \ --with-realtime-testsuite \ @@ -31,6 +30,10 @@ CONFIGURE_ARGS+= --with-open-posix-testsuite \ --without-perl \ --without-expect +pre-configure: + $(MAKE) -C $(WRKBUILD) distclean + $(MAKE) -C $(WRKBUILD) autotools + # bessel float version not implemented in uClibc pre-build: -rm ${WRKBUILD}/testcases/misc/math/float/float_bessel.c diff --git a/package/ltp/patches/0001-realtime-Fix-exp10-check.patch b/package/ltp/patches/0001-realtime-Fix-exp10-check.patch new file mode 100644 index 000000000..f2be67573 --- /dev/null +++ b/package/ltp/patches/0001-realtime-Fix-exp10-check.patch @@ -0,0 +1,40 @@ +From 03bf456cb5b65ff7cfabfab3758ca8f3c6816556 Mon Sep 17 00:00:00 2001 +From: Cyril Hrubis <chrubis@suse.cz> +Date: Thu, 4 Sep 2014 11:28:55 +0200 +Subject: [PATCH] realtime: Fix exp10 check. + +The parameter to exp10() function was constant and because of that it +was substituted by a constant at the compile time. + +This patch passes volatile float as the parameter and also adds -lm to +the LIBS which is needed to link the test. + +Reported-by: Waldemar Brodkorb <wbx@openadk.org> +Signed-off-by: Cyril Hrubis <chrubis@suse.cz> +--- + testcases/realtime/m4/ltp-exp10.m4 | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/testcases/realtime/m4/ltp-exp10.m4 b/testcases/realtime/m4/ltp-exp10.m4 +index 4fe7091..84a3d9b 100644 +--- a/testcases/realtime/m4/ltp-exp10.m4 ++++ b/testcases/realtime/m4/ltp-exp10.m4 +@@ -24,10 +24,14 @@ AC_DEFUN([LTP_CHECK_EXP10],[ + AH_TEMPLATE(HAVE_EXP10, + [Define to 1 if you have 'exp10' function.]) + AC_MSG_CHECKING([for exp10]) ++backup_ldlibs="$LIBS" ++LIBS+=" -lm" + AC_TRY_LINK([#define _GNU_SOURCE + #include <math.h>], + [ +- exp10(0.00); ++ volatile float val; ++ exp10(val); + ], + AC_DEFINE(HAVE_EXP10) AC_MSG_RESULT(yes), AC_MSG_RESULT(no)) ++LIBS="$backup_ldlibs" + ]) +-- +1.8.5.5 + diff --git a/target/m68k/uclibc-nommu.config b/target/m68k/uclibc-nommu.config index 49c804c17..227ebf389 100644 --- a/target/m68k/uclibc-nommu.config +++ b/target/m68k/uclibc-nommu.config @@ -73,9 +73,9 @@ HAS_NO_THREADS=y UCLIBC_HAS_SYSLOG=y UCLIBC_HAS_LFS=y # MALLOC is not set -MALLOC_SIMPLE=y -# MALLOC_STANDARD is not set -# MALLOC_GLIBC_COMPAT is not set +# MALLOC_SIMPLE is not set +MALLOC_STANDARD=y +MALLOC_GLIBC_COMPAT=y UCLIBC_DYNAMIC_ATEXIT=y COMPAT_ATEXIT=y UCLIBC_SUSV3_LEGACY=y |