diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-12-05 17:41:09 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-12-05 17:41:09 +0100 |
| commit | ab9613f01577b3dbfdb7d174f94fc095c5a1b8be (patch) | |
| tree | 76d2ab24cd0aecb7fd114f5f7e6fc6a53841c057 | |
| parent | 2d7243fe9d10d9054dbceceb9a3f43b5eb4e3f56 (diff) | |
| parent | 9a3daeb406645a14671d8c2c6002f1095f883b88 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | mk/build.mk | 13 | ||||
| -rw-r--r-- | package/xbmc/patches/patch-configure_in | 11 |
3 files changed, 27 insertions, 0 deletions
@@ -146,6 +146,9 @@ allmodconfig: .prereq_done package_index: .prereq_done @${GMAKE_INV} package_index +release: .prereq_done + @${GMAKE_INV} release + bulk: .prereq_done @${GMAKE_INV} bulk diff --git a/mk/build.mk b/mk/build.mk index f5d62460f..0b3d2cc73 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -562,6 +562,19 @@ bulktoolchain: if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; exit 1;fi \ done +release: + for libc in uclibc eglibc glibc musl;do \ + mkdir -p $(TOPDIR)/bin/$(SYSTEM)_$(ARCH)_$$libc; \ + ( \ + echo === building $$libc on $$(date); \ + $(GMAKE) prereq && \ + $(GMAKE) ARCH=$(ARCH) SYSTEM=$(SYSTEM) LIBC=$$libc FS=archive allmodconfig; \ + $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \ + rm .config; \ + ) 2>&1 | tee $(TOPDIR)/bin/$(SYSTEM)_$(ARCH)_$$libc/build.log; \ + if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; break;fi \ + done + # build all target architecture, target systems and libc combinations bulk: for libc in uclibc eglibc glibc musl;do \ diff --git a/package/xbmc/patches/patch-configure_in b/package/xbmc/patches/patch-configure_in new file mode 100644 index 000000000..502ee03c0 --- /dev/null +++ b/package/xbmc/patches/patch-configure_in @@ -0,0 +1,11 @@ +--- xbmc-12.2.orig/configure.in 2013-05-03 07:57:40.000000000 +0200 ++++ xbmc-12.2/configure.in 2013-12-04 11:36:43.000000000 +0100 +@@ -876,7 +876,7 @@ if test "$use_gles" = "yes"; then + AC_DEFINE([HAVE_LIBEGL],[1],["Define to 1 if you have the `EGL' library (-lEGL)."]) + AC_DEFINE([HAVE_LIBGLESV2],[1],["Define to 1 if you have the `GLESv2' library (-lGLESv2)."]) + AC_MSG_RESULT(== WARNING: OpenGLES support is assumed.) +- LIBS="$LIBS -lEGL -lGLESv2 -lbcm_host -lvcos -lvchiq_arm" ++ LIBS="$LIBS -lEGL -lGLESv2 -lbcm_host -lvcos -lvchiq_arm -lkhrn_static -lpthread -lm" + else + AC_CHECK_LIB([EGL], [main],, AC_MSG_ERROR($missing_library)) + AC_CHECK_LIB([GLESv2],[main],, AC_MSG_ERROR($missing_library)) |