diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-10 09:35:55 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-10 09:35:55 +0100 |
| commit | 6ab5516b38f456affc6776e79e72e2761e89eec0 (patch) | |
| tree | 4ead02b3e5be335209a281819ebc18a8df3c899e /package | |
| parent | b7c4dda05effe16c0a6cae108348bd1e496b7f37 (diff) | |
| parent | ecf3290a88183d946e731b2fb3992dc5c3222a0f (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package')
| -rw-r--r-- | package/libstdcxx/Makefile | 11 | ||||
| -rw-r--r-- | package/openjdk7/Makefile | 2 | ||||
| -rw-r--r-- | package/squeezelite/Makefile | 3 | ||||
| -rw-r--r-- | package/squeezelite/patches/patch-output_alsa_c | 13 |
4 files changed, 17 insertions, 12 deletions
diff --git a/package/libstdcxx/Makefile b/package/libstdcxx/Makefile index 5c6cc2b2f..7910af6b7 100644 --- a/package/libstdcxx/Makefile +++ b/package/libstdcxx/Makefile @@ -16,12 +16,6 @@ endif endif endif -ifeq ($(ADK_LINUX_MICROBLAZE),y) -LIBSTDCXX_VER:= 18 -else -LIBSTDCXX_VER:= 17 -endif - PKG_NAME:= libstdcxx PKG_DESCR:= C++ support library PKG_SECTION:= libs @@ -41,10 +35,7 @@ do-install: ifeq ($(ADK_NATIVE),y) $(CP) /usr/lib/libstdc++.so* ${IDIR_LIBSTDCXX}/usr/lib else - (cd ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}; ln -sf libstdc++.so.6.0.${LIBSTDCXX_VER} libstdc++.so.6) - (cd ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}; ln -sf libstdc++.so.6.0.${LIBSTDCXX_VER} libstdc++.so) - (cd ${STAGING_TARGET_DIR}/${ADK_TARGET_LIBC_PATH}/; ln -sf libstdc++.so.6.0.${LIBSTDCXX_VER} libstdc++.so) - $(CP) ${STAGING_TARGET_DIR}/${ADK_TARGET_LIBC_PATH}/libstdc++.so.6.0.${LIBSTDCXX_VER} ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH} + $(CP) ${STAGING_TARGET_DIR}/${ADK_TARGET_LIBC_PATH}/libstdc++.so* ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH} -@rm ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}/libstdc++.so.*-gdb.py endif diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile index d96e9ad53..b2371bb97 100644 --- a/package/openjdk7/Makefile +++ b/package/openjdk7/Makefile @@ -83,7 +83,7 @@ CONFIGURE_ARGS+= $(CONFIGURE_COMMON) CONFIGURE_ARGS+= --disable-bootstrap CONFIGURE_ENV+= LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib -MAKE_ENV+= ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) \ +MAKE_ENV+= ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/bin \ ALT_OPENWIN_HOME=$(STAGING_DIR)/usr/ \ ALT_CUPS_HEADERS_PATH=$(STAGING_DIR)/usr/include/ \ ALT_FREETYPE_HEADERS_PATH=$(STAGING_DIR)/usr/include/ \ diff --git a/package/squeezelite/Makefile b/package/squeezelite/Makefile index f200cfee4..aee2b2b70 100644 --- a/package/squeezelite/Makefile +++ b/package/squeezelite/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= squeezelite PKG_VERSION:= 1.5 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 7605af4d64291495645f88575a564475 PKG_DESCR:= headless squeezebox emulator PKG_SECTION:= multimedia @@ -22,6 +22,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,SQUEEZELITE,squeezelite,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +TARGET_CPPFLAGS+= -D_GNU_SOURCE -D_POSIX_SOURCE CONFIG_STYLE:= manual INSTALL_STYLE:= manual diff --git a/package/squeezelite/patches/patch-output_alsa_c b/package/squeezelite/patches/patch-output_alsa_c new file mode 100644 index 000000000..7a3e8f836 --- /dev/null +++ b/package/squeezelite/patches/patch-output_alsa_c @@ -0,0 +1,13 @@ +--- squeezelite-1.5.orig/output_alsa.c 2014-01-24 11:24:16.000000000 +0100 ++++ squeezelite-1.5/output_alsa.c 2014-02-08 13:36:12.000000000 +0100 +@@ -670,8 +670,10 @@ void output_init_alsa(log_level level, c + LOG_INFO("memory locked"); + } + ++#if defined(__GLIBC__) + mallopt(M_TRIM_THRESHOLD, -1); + mallopt(M_MMAP_MAX, 0); ++#endif + + touch_memory(silencebuf, MAX_SILENCE_FRAMES * BYTES_PER_FRAME); + touch_memory(outputbuf->buf, outputbuf->size); |