diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-17 16:39:51 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-17 16:39:51 +0100 |
| commit | 055a91209eea4512209445922055af125af2ab34 (patch) | |
| tree | 67d634875187df22a6e2935c4788bac5f96da4ba /package | |
| parent | 58a0648738fc9e3454b526473cb8355af1e32925 (diff) | |
| parent | ddc85ef84ba7c89590f1fa794a01d9ccbfd8bcc1 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package')
| -rw-r--r-- | package/glibc/Makefile | 6 | ||||
| -rw-r--r-- | package/mksh/Makefile | 5 | ||||
| -rw-r--r-- | package/valgrind/Makefile | 2 | ||||
| -rw-r--r-- | package/valgrind/patches/patch-configure_ac | 11 |
4 files changed, 19 insertions, 5 deletions
diff --git a/package/glibc/Makefile b/package/glibc/Makefile index 92ccf8cd4..17c49f3af 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -31,10 +31,10 @@ INSTALL_STYLE:= manual # compile nothing, glibc is already build in toolchain directory do-install: ${INSTALL_DIR} ${IDIR_GLIBC}/$(ADK_TARGET_LIBC_PATH) - $(CP) $(STAGING_TARGET_DIR)/$(ADK_TARGET_LIBC_PATH)/ld*.so* $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH) + $(CP) $(STAGING_TARGET_DIR)/lib/ld*.so* $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH) for file in libc libcrypt libdl libm libnsl libresolv libutil libnss_compat libnss_dns libnss_files; do \ - $(CP) $(STAGING_TARGET_DIR)/$(ADK_TARGET_LIBC_PATH)/$$file.so* $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \ - $(CP) $(STAGING_TARGET_DIR)/$(ADK_TARGET_LIBC_PATH)/$$file-$(PKG_VERSION).so $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \ + $(CP) $(STAGING_TARGET_DIR)/lib/$$file.so* $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \ + $(CP) $(STAGING_TARGET_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \ done ${INSTALL_DIR} $(IDIR_GLIBC)/usr/bin $(CP) $(STAGING_TARGET_DIR)/usr/bin/getconf $(IDIR_GLIBC)/usr/bin diff --git a/package/mksh/Makefile b/package/mksh/Makefile index c40d9d807..a38b97733 100644 --- a/package/mksh/Makefile +++ b/package/mksh/Makefile @@ -21,6 +21,11 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,MKSH,mksh,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +ifeq ($(ADK_STATIC),y) +TARGET_CFLAGS+= -static +TARGET_LDFLAGS+= -static +endif + TARGET_CPPFLAGS+= -DMKSH_SMALL=1 CONFIG_STYLE:= manual BUILD_STYLE:= manual diff --git a/package/valgrind/Makefile b/package/valgrind/Makefile index 025db9dac..9c78dc20c 100644 --- a/package/valgrind/Makefile +++ b/package/valgrind/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= valgrind PKG_VERSION:= 3.9.0 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 0947de8112f946b9ce64764af7be6df2 PKG_DESCR:= memory management debugging PKG_SECTION:= debug diff --git a/package/valgrind/patches/patch-configure_ac b/package/valgrind/patches/patch-configure_ac index 844275cca..cc7286c90 100644 --- a/package/valgrind/patches/patch-configure_ac +++ b/package/valgrind/patches/patch-configure_ac @@ -1,5 +1,5 @@ --- valgrind-3.9.0.orig/configure.ac 2013-11-01 00:28:16.000000000 +0100 -+++ valgrind-3.9.0/configure.ac 2013-11-07 17:26:16.000000000 +0100 ++++ valgrind-3.9.0/configure.ac 2014-03-17 14:18:45.000000000 +0100 @@ -155,6 +155,7 @@ esac # configure-time, and distinguishes them from the VGA_*/VGO_*/VGP_* # variables used when compiling C files. @@ -36,6 +36,15 @@ #---------------------------------------------------------------------------- # Sometimes it's convenient to subvert the bi-arch build system and +@@ -273,7 +286,7 @@ case "${host_os}" in + # Ok, this is linux. Check the kernel version + AC_MSG_CHECKING([for the kernel version]) + +- kernel=`uname -r` ++ kernel=3.13 + + case "${kernel}" in + 2.6.*|3.*) @@ -792,6 +805,15 @@ AC_EGREP_CPP([BIONIC_LIBC], [ ], GLIBC_VERSION="bionic") |