From 739d512289d14ade82e9fbae7f4371e65989622f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 27 Nov 2016 22:19:21 +0100 Subject: add three library methods, static, shared or both Rename the static symbol and add the choice to a more visible place for users. --- package/bluez/Makefile | 2 +- package/boost/Makefile | 2 +- package/bzip2/Makefile | 4 ++-- package/e2fsprogs/Makefile | 2 +- package/file/Makefile | 2 +- package/glibc/Makefile | 2 +- package/libevent/Makefile | 2 +- package/libgcc/Makefile | 2 +- package/libgfortran/Makefile | 2 +- package/libgo/Makefile | 2 +- package/libpthread-stubs/Makefile | 2 +- package/libthread_db/Makefile | 2 +- package/lvm/Makefile | 2 +- package/musl/Makefile | 2 +- package/ncurses/Makefile | 2 +- package/parted/Makefile | 4 ++-- package/pkgconf/Makefile | 2 +- package/python2/Makefile | 4 ++-- package/sqlite/Makefile | 2 +- package/sudo/Makefile | 2 +- package/uclibc-ng-test/Makefile | 2 +- package/x11vnc/Makefile | 2 +- package/zlib/Makefile | 4 ++-- 23 files changed, 27 insertions(+), 27 deletions(-) (limited to 'package') diff --git a/package/bluez/Makefile b/package/bluez/Makefile index 497de4c4f..bf12c5187 100644 --- a/package/bluez/Makefile +++ b/package/bluez/Makefile @@ -21,7 +21,7 @@ $(eval $(call PKG_template,BLUEZ,bluez,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPEN TARGET_LDFLAGS+= -lncurses -ifeq ($(ADK_TARGET_USE_STATIC_LIBS),y) +ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) XAKE_FLAGS+= CCLD="$(TARGET_CC) -all-static -pthread" endif diff --git a/package/boost/Makefile b/package/boost/Makefile index ed18cccb0..e9c70f6f6 100644 --- a/package/boost/Makefile +++ b/package/boost/Makefile @@ -135,7 +135,7 @@ PYTHON_INCLUDE:="`find ${STAGING_TARGET_DIR}/usr/include/ -maxdepth 1 -type d -n PYTHON_LIB:= "`find ${STAGING_TARGET_DIR}/usr/lib/ -maxdepth 1 -type d -name "python*" | head -1`" USER_JAM:= ${WRKBUILD}/tools/build/user-config.jam -ifeq ($(ADK_TARGET_USE_STATIC_LIBS)$(ADK_TARGET_BINFMT_FLAT),y) +ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY)$(ADK_TARGET_BINFMT_FLAT),y) LINKMODE:= static else LINKMODE:= shared diff --git a/package/bzip2/Makefile b/package/bzip2/Makefile index 7ad9e9f97..4edfc4b7a 100644 --- a/package/bzip2/Makefile +++ b/package/bzip2/Makefile @@ -34,7 +34,7 @@ $(eval $(call PKG_template,LIBBZ2,libbz2,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_ HOST_STYLE:= manual HOST_MAKE_FILE:= Makefile -ifneq ($(ADK_TARGET_USE_STATIC_LIBS),y) +ifneq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) MAKE_FILE:= Makefile-libbz2_so BIN_FILE:= bzip2-shared else @@ -57,7 +57,7 @@ bzip2-hostinstall: do-install: ${INSTALL_DIR} $(STAGING_TARGET_DIR)/usr/include $(CP) $(WRKBUILD)/bzlib.h $(STAGING_TARGET_DIR)/usr/include -ifeq ($(ADK_TARGET_USE_STATIC_LIBS),y) +ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) $(CP) ${WRKBUILD}/libbz2.a ${STAGING_TARGET_DIR}/usr/lib endif diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index 2c2d99f1d..dcee96ce2 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -64,7 +64,7 @@ HOST_CONFIGURE_ARGS+= --disable-rpath \ --disable-defrag \ --disable-debugfs -ifeq ($(ADK_TARGET_USE_STATIC_LIBS),y) +ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) CONFIGURE_ARGS+= --disable-elf-shlibs else CONFIGURE_ARGS+= --enable-elf-shlibs diff --git a/package/file/Makefile b/package/file/Makefile index 4cda8385e..eb7cb98e5 100644 --- a/package/file/Makefile +++ b/package/file/Makefile @@ -35,7 +35,7 @@ $(eval $(call PKG_template,MAGIC,magic,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_MAG AUTOTOOL_STYLE:= autoreconf -ifeq ($(ADK_TARGET_USE_STATIC_LIBS),y) +ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) MAKE_FLAGS+= LDFLAGS="$(TARGET_LDFLAGS) -all-static" endif diff --git a/package/glibc/Makefile b/package/glibc/Makefile index fa0cec5e6..adeff7f07 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -45,7 +45,7 @@ INSTALL_STYLE:= manual # compile nothing, glibc is already build in toolchain directory do-install: -ifneq ($(ADK_TARGET_USE_STATIC_LIBS),y) +ifneq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) ${INSTALL_DIR} ${IDIR_GLIBC}/$(ADK_TARGET_LIBC_PATH) $(CP) $(STAGING_TARGET_DIR)/lib/ld*.so* $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH) for file in libc libpthread librt libcrypt libdl libm libnsl libresolv libutil libnss_dns libnss_files; do \ diff --git a/package/libevent/Makefile b/package/libevent/Makefile index 55a3d5ca6..bb3ae87d7 100644 --- a/package/libevent/Makefile +++ b/package/libevent/Makefile @@ -20,7 +20,7 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBEVENT,libevent,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -ifeq ($(ADK_TARGET_USE_STATIC_LIBS),y) +ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) MAKE_FLAGS+= LDFLAGS="$(TARGET_LDFLAGS) -all-static" endif diff --git a/package/libgcc/Makefile b/package/libgcc/Makefile index b6f0a55dd..e9ae22b86 100644 --- a/package/libgcc/Makefile +++ b/package/libgcc/Makefile @@ -23,7 +23,7 @@ INSTALL_STYLE:= manual libgcc-install: $(INSTALL_DIR) ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH) -ifeq ($(ADK_TARGET_USE_STATIC_LIBS),) +ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),) ifeq ($(ADK_TARGET_ARCH_SH),y) ifeq ($(ADK_TARGET_CPU_SH_SH3),y) ${CP} ${STAGING_TARGET_DIR}/usr/lib/!m3*/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH) diff --git a/package/libgfortran/Makefile b/package/libgfortran/Makefile index 596a4887c..1f0353bea 100644 --- a/package/libgfortran/Makefile +++ b/package/libgfortran/Makefile @@ -23,7 +23,7 @@ INSTALL_STYLE:= manual libgfortran-install: $(INSTALL_DIR) ${IDIR_LIBGFORTRAN}/$(ADK_TARGET_LIBC_PATH) -ifeq ($(ADK_TARGET_USE_STATIC_LIBS),) +ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),) ifeq ($(ADK_TARGET_BINFMT_FLAT),) ${CP} ${STAGING_TARGET_DIR}/usr/lib/libgfortran.so* ${IDIR_LIBGFORTRAN}/$(ADK_TARGET_LIBC_PATH) endif diff --git a/package/libgo/Makefile b/package/libgo/Makefile index b447a5fc3..4b4589885 100644 --- a/package/libgo/Makefile +++ b/package/libgo/Makefile @@ -24,7 +24,7 @@ INSTALL_STYLE:= manual libgo-install: $(INSTALL_DIR) ${IDIR_LIBGO}/$(ADK_TARGET_LIBC_PATH) -ifeq ($(ADK_TARGET_USE_STATIC_LIBS),) +ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),) ifeq ($(ADK_TARGET_BINFMT_FLAT),) ${CP} ${STAGING_TARGET_DIR}/usr/lib/libgo.so* ${IDIR_LIBGO}/$(ADK_TARGET_LIBC_PATH) endif diff --git a/package/libpthread-stubs/Makefile b/package/libpthread-stubs/Makefile index b06e726bf..3ada9f220 100644 --- a/package/libpthread-stubs/Makefile +++ b/package/libpthread-stubs/Makefile @@ -22,7 +22,7 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,LIBPTHREAD_STUBS,libpthread-stubs,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,LIBPTHREAD_STUBS,libpthread-stubs,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -ifeq ($(ADK_TARGET_USE_STATIC_LIBS),y) +ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) TARGET_LDFLAGS+= -pthread endif diff --git a/package/libthread_db/Makefile b/package/libthread_db/Makefile index 33ca12679..5936decc6 100644 --- a/package/libthread_db/Makefile +++ b/package/libthread_db/Makefile @@ -31,7 +31,7 @@ BUILD_STYLE:= manual INSTALL_STYLE:= manual do-install: -ifeq ($(ADK_TARGET_USE_STATIC_LIBS),) +ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),) ifeq ($(ADK_TARGET_LIB_MUSL),) ifeq (${ADK_TARGET_UCLINUX},) ${INSTALL_DIR} ${IDIR_LIBTHREAD_DB}/$(ADK_TARGET_LIBC_PATH) diff --git a/package/lvm/Makefile b/package/lvm/Makefile index 16131ff95..8a63931b8 100644 --- a/package/lvm/Makefile +++ b/package/lvm/Makefile @@ -32,7 +32,7 @@ $(eval $(call PKG_template,LVM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_D $(eval $(call PKG_template,DEVICE_MAPPER,device-mapper,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_DEVICE_MAPPER},${PKG_SECTION})) $(eval $(call PKG_template,LIBDEVMAPPER,libdevmapper,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBDEVMAPPER},${PKGSC_LIBDEVMAPPER},${PKG_OPTS})) -ifeq ($(ADK_TARGET_USE_STATIC_LIBS),y) +ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) CONFIGURE_ARGS+= --enable-static_link endif diff --git a/package/musl/Makefile b/package/musl/Makefile index 0e1574695..a7bd3a80d 100644 --- a/package/musl/Makefile +++ b/package/musl/Makefile @@ -84,7 +84,7 @@ endif # do nothing, musl is already build in toolchain directory do-install: -ifneq ($(ADK_TARGET_USE_STATIC_LIBS),y) +ifneq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) ${INSTALL_DIR} $(IDIR_MUSL)/bin ${INSTALL_DIR} $(IDIR_MUSL)/$(ADK_TARGET_LIBC_PATH) $(CP) $(STAGING_TARGET_DIR)/usr/lib/libc.so $(IDIR_MUSL)/$(ADK_TARGET_LIBC_PATH) diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile index c0336e366..e64d3fe59 100644 --- a/package/ncurses/Makefile +++ b/package/ncurses/Makefile @@ -26,7 +26,7 @@ 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_BINFMT_FLAT)$(ADK_TARGET_USE_STATIC_LIBS),y) +ifeq ($(ADK_TARGET_BINFMT_FLAT)$(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) CONFIGURE_ARGS+= --with-static else CONFIGURE_ARGS+= --with-shared diff --git a/package/parted/Makefile b/package/parted/Makefile index cba92d8aa..9508e1ab2 100644 --- a/package/parted/Makefile +++ b/package/parted/Makefile @@ -23,7 +23,7 @@ ifeq ($(ADK_TARGET_LIBICONV_TINY),y) TARGET_LDFLAGS+= -liconv endif -ifeq ($(ADK_TARGET_USE_STATIC_LIBS),y) +ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) CONFIGURE_ARGS+= --disable-dynamic-loading endif @@ -31,7 +31,7 @@ CONFIGURE_ARGS+= --disable-device-mapper \ --without-readline parted-install: -ifneq ($(ADK_TARGET_USE_STATIC_LIBS),y) +ifneq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) $(INSTALL_DIR) $(IDIR_PARTED)/usr/lib $(CP) $(WRKINST)/usr/lib/libparted*so* $(IDIR_PARTED)/usr/lib endif diff --git a/package/pkgconf/Makefile b/package/pkgconf/Makefile index 47c2b7b78..bded34468 100644 --- a/package/pkgconf/Makefile +++ b/package/pkgconf/Makefile @@ -23,7 +23,7 @@ $(eval $(call PKG_template,PKGCONF,pkgconf,$(PKG_VERSION)-${PKG_RELEASE},${PKG_D hostpost-install: $(CP) ./files/pkg-config $(STAGING_HOST_DIR)/usr/bin -ifeq ($(ADK_TARGET_USE_STATIC_LIBS),y) +ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) PATH="$(HOST_PATH)" $(SED) "s#@@OPTS@@#--static#" $(STAGING_HOST_DIR)/usr/bin/pkg-config else PATH="$(HOST_PATH)" $(SED) "s#@@OPTS@@##" $(STAGING_HOST_DIR)/usr/bin/pkg-config diff --git a/package/python2/Makefile b/package/python2/Makefile index 8e870e55b..32e8b33d9 100644 --- a/package/python2/Makefile +++ b/package/python2/Makefile @@ -83,7 +83,7 @@ $(eval $(call PKG_mod_template,PYTHON2_MOD_NCURSES,_curses)) $(eval $(call PKG_mod_template,PYTHON2_MOD_SSL,_ssl)) $(eval $(call PKG_mod_template,PYTHON2_MOD_READLINE,readline)) -ifeq ($(ADK_TARGET_USE_STATIC_LIBS),y) +ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) CONFIGURE_ARGS+= --disable-shared endif @@ -133,7 +133,7 @@ pre-configure: $(SED) "s#@EXENAME@#$(STAGING_HOST_DIR)/usr/bin/python#" \ $(WRKBUILD)/Misc/python-config.in -ifeq ($(ADK_TARGET_USE_STATIC_LIBS),y) +ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) python2-install: else python2-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} diff --git a/package/sqlite/Makefile b/package/sqlite/Makefile index 0a36e8403..cf035471f 100644 --- a/package/sqlite/Makefile +++ b/package/sqlite/Makefile @@ -31,7 +31,7 @@ $(eval $(call PKG_template,SQLITE_CLI,sqlite-cli,${PKG_VERSION}-${PKG_RELEASE},$ TARGET_CFLAGS:= $(filter-out -ffast-math,$(TARGET_CFLAGS)) -ifeq ($(ADK_TARGET_USE_STATIC_LIBS),y) +ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) CONFIGURE_ARGS+= --enable-dynamic-extensions=no endif diff --git a/package/sudo/Makefile b/package/sudo/Makefile index 93d57db09..c472268a5 100644 --- a/package/sudo/Makefile +++ b/package/sudo/Makefile @@ -20,7 +20,7 @@ $(eval $(call PKG_template,SUDO,sudo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS HOST_CPPFLAGS+= -I../ -I../include -ifeq ($(ADK_TARGET_USE_STATIC_LIBS),y) +ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) MAKE_FLAGS+= LDFLAGS="$(TARGET_LDFLAGS) -all-static" else TARGET_LDFLAGS+= -ldl diff --git a/package/uclibc-ng-test/Makefile b/package/uclibc-ng-test/Makefile index 7481a0c27..ab4b6347c 100644 --- a/package/uclibc-ng-test/Makefile +++ b/package/uclibc-ng-test/Makefile @@ -34,7 +34,7 @@ endif ifeq ($(ADK_TARGET_BINFMT_FLAT),y) XAKE_FLAGS+= NO_DL=1 endif -ifeq ($(ADK_TARGET_USE_STATIC_LIBS),y) +ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) XAKE_FLAGS+= NO_DL=1 NO_TLS=1 NO_NPTL=1 endif ifeq ($(ADK_RUNTIME_ENABLE_LOCALE),) diff --git a/package/x11vnc/Makefile b/package/x11vnc/Makefile index 9f7195bc1..9fad7e631 100644 --- a/package/x11vnc/Makefile +++ b/package/x11vnc/Makefile @@ -20,7 +20,7 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,X11VNC,x11vnc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -ifeq ($(ADK_TARGET_USE_STATIC_LIBS),y) +ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) MAKE_FLAGS+= CFLAGS="${TARGET_CFLAGS} -static" \ LIBS="-lxcb -lXau -lXdmcp -ldl -pthread -ljpeg -lz" endif diff --git a/package/zlib/Makefile b/package/zlib/Makefile index a65da241f..45670b36c 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -20,12 +20,12 @@ $(eval $(call PKG_template,ZLIB,zlib,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS CONFIG_STYLE:= manual CONFIGURE_ENV+= uname=Linux -ifeq ($(ADK_TARGET_BINFMT_FLAT)$(ADK_TARGET_USE_STATIC_LIBS),) +ifeq ($(ADK_TARGET_BINFMT_FLAT)$(ADK_TARGET_USE_STATIC_LIBS_ONLY),) CONFIGURE_OPTS:= --shared endif ALL_TARGET:= libz.a -ifeq ($(ADK_TARGET_BINFMT_FLAT)$(ADK_TARGET_USE_STATIC_LIBS),) +ifeq ($(ADK_TARGET_BINFMT_FLAT)$(ADK_TARGET_USE_STATIC_LIBS_ONLY),) ALL_TARGET+= libz.so.$(PKG_VERSION) endif -- cgit v1.2.3