diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2017-12-17 19:16:10 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2017-12-17 19:16:10 +0100 |
| commit | 43c7686b4d6afc56d2909c1630ea2eee626490bb (patch) | |
| tree | 8f7878c63c45c757cf8b6f7ac7fac0783da6bf31 /package | |
| parent | 41f5fc3d3eb0b17faeed0de4ddc736c94054db80 (diff) | |
allow to build static gdb/strace with static/shared mixed toolchain
Diffstat (limited to 'package')
| -rw-r--r-- | package/expat/Makefile | 9 | ||||
| -rw-r--r-- | package/gdbserver/Makefile | 2 | ||||
| -rw-r--r-- | package/ncurses/Makefile | 5 | ||||
| -rw-r--r-- | package/zlib/Makefile | 5 |
4 files changed, 18 insertions, 3 deletions
diff --git a/package/expat/Makefile b/package/expat/Makefile index 47b4328ce..2bb86dd21 100644 --- a/package/expat/Makefile +++ b/package/expat/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= expat -PKG_VERSION:= 2.2.3 +PKG_VERSION:= 2.2.5 PKG_RELEASE:= 1 -PKG_HASH:= b31890fb02f85c002a67491923f89bda5028a880fd6c374f707193ad81aace5f +PKG_HASH:= d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6 PKG_DESCR:= xml parsing library PKG_SECTION:= libs/data PKG_NEEDS:= c++ @@ -23,6 +23,11 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call HOST_template,LIBEXPAT,libexpat,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,LIBEXPAT,libexpat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +ifeq ($(ADK_TARGET_USE_STATIC_AND_SHARED_LIBS),y) +TARGET_CFLAGS:= $(filter-out -static,$(TARGET_CFLAGS)) +TARGET_LDFLAGS:=$(filter-out -static,$(TARGET_LDFLAGS)) +endif + libexpat-install: ${INSTALL_DIR} ${IDIR_LIBEXPAT}/usr/lib ${CP} ${WRKINST}/usr/lib/libexpat.so* ${IDIR_LIBEXPAT}/usr/lib/ diff --git a/package/gdbserver/Makefile b/package/gdbserver/Makefile index e31c4df3c..f254da653 100644 --- a/package/gdbserver/Makefile +++ b/package/gdbserver/Makefile @@ -29,7 +29,7 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,GDBSERVER,gdbserver,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -ifneq ($(ADK_TARGET_BINFMT_FLAT)$(ADK_TARGET_USE_STATIC_LIBS_ONLY),) +ifneq ($(ADK_TARGET_BINFMT_FLAT)$(ADK_TARGET_USE_STATIC_LIBS_ONLY)$(ADK_TARGET_USE_STATIC_AND_SHARED_LIBS),) TARGET_LDFLAGS+= -static-libstdc++ CONFIGURE_ARGS+= --disable-build-with-cxx --with-libthread-db=$(STAGING_TARGET_DIR)/usr/lib/libthread_db.a endif diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile index e64d3fe59..2b2c3d2d1 100644 --- a/package/ncurses/Makefile +++ b/package/ncurses/Makefile @@ -26,6 +26,11 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call HOST_template,LIBNCURSES,libncurses,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,LIBNCURSES,libncurses,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +ifeq ($(ADK_TARGET_USE_STATIC_AND_SHARED_LIBS),y) +TARGET_CFLAGS:= $(filter-out -static,$(TARGET_CFLAGS)) +TARGET_LDFLAGS:=$(filter-out -static,$(TARGET_LDFLAGS)) +endif + ifeq ($(ADK_TARGET_BINFMT_FLAT)$(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) CONFIGURE_ARGS+= --with-static else diff --git a/package/zlib/Makefile b/package/zlib/Makefile index f77620608..10ba76375 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -19,6 +19,11 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,ZLIB,zlib,$(PKG_VERSION)-$(PKG_RELEASE))) $(eval $(call PKG_template,ZLIB,zlib,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) +ifeq ($(ADK_TARGET_USE_STATIC_AND_SHARED_LIBS),y) +TARGET_CFLAGS:= $(filter-out -static,$(TARGET_CFLAGS)) +TARGET_LDFLAGS:=$(filter-out -static,$(TARGET_LDFLAGS)) +endif + HOST_STYLE:= auto HOST_CONFIG_STYLE:= manual HOST_CONFIGURE_ENV+= uname=Linux |