1e4f77a2e4
When static linking some dependency library can be missing (i.e. -latomic for -lcrypto) on linking libraries list. This is because when static linking libraries dependencies are not transparently linked into binary. To avoid moving libraries before/after one another or add new ones that are not needed at all in the dynamic linking case, we use `pkg-config --libs LIBRARY` where LIBRARY is the library we "probe" for its existence and dependency. In this commit, we: - Remove 0005-fix-static-link-zlib.patch where -lcrypto and -lz were swapped, as it is no longer needed thanks to the following point. - Replace it with 0005-Use-pkgconf-to-get-libs-deps.patch where -lcrypto has been substituted with `pkg-config --libs libcrypto` - Add host-pkgconf to ANDROID_TOOLS_DEPENDENCIES Fixes: http://autobuild.buildroot.net/results/d3d6679cfc8afe4467368bd3d31483172c1032de/ Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
96 lines
3.3 KiB
Makefile
96 lines
3.3 KiB
Makefile
################################################################################
|
|
#
|
|
# android-tools
|
|
#
|
|
################################################################################
|
|
|
|
ANDROID_TOOLS_SITE = https://launchpad.net/ubuntu/+archive/primary/+files
|
|
ANDROID_TOOLS_VERSION = 4.2.2+git20130218
|
|
ANDROID_TOOLS_SOURCE = android-tools_$(ANDROID_TOOLS_VERSION).orig.tar.xz
|
|
ANDROID_TOOLS_EXTRA_DOWNLOADS = android-tools_$(ANDROID_TOOLS_VERSION)-3ubuntu41.debian.tar.gz
|
|
HOST_ANDROID_TOOLS_EXTRA_DOWNLOADS = $(ANDROID_TOOLS_EXTRA_DOWNLOADS)
|
|
ANDROID_TOOLS_LICENSE = Apache-2.0
|
|
ANDROID_TOOLS_LICENSE_FILES = debian/copyright
|
|
ANDROID_TOOLS_DEPENDENCIES = host-pkgconf
|
|
|
|
# Extract the Debian tarball inside the sources
|
|
define ANDROID_TOOLS_DEBIAN_EXTRACT
|
|
$(call suitable-extractor,$(notdir $(ANDROID_TOOLS_EXTRA_DOWNLOADS))) \
|
|
$(ANDROID_TOOLS_DL_DIR)/$(notdir $(ANDROID_TOOLS_EXTRA_DOWNLOADS)) | \
|
|
$(TAR) -C $(@D) $(TAR_OPTIONS) -
|
|
endef
|
|
|
|
HOST_ANDROID_TOOLS_POST_EXTRACT_HOOKS += ANDROID_TOOLS_DEBIAN_EXTRACT
|
|
ANDROID_TOOLS_POST_EXTRACT_HOOKS += ANDROID_TOOLS_DEBIAN_EXTRACT
|
|
|
|
# Apply the Debian patches before applying the Buildroot patches
|
|
define ANDROID_TOOLS_DEBIAN_PATCH
|
|
$(APPLY_PATCHES) $(@D) $(@D)/debian/patches \*
|
|
endef
|
|
|
|
HOST_ANDROID_TOOLS_PRE_PATCH_HOOKS += ANDROID_TOOLS_DEBIAN_PATCH
|
|
ANDROID_TOOLS_PRE_PATCH_HOOKS += ANDROID_TOOLS_DEBIAN_PATCH
|
|
|
|
ifeq ($(BR2_PACKAGE_HOST_ANDROID_TOOLS_FASTBOOT),y)
|
|
HOST_ANDROID_TOOLS_BUILD_TARGETS += fastboot
|
|
HOST_ANDROID_TOOLS_INSTALL_TARGETS += build-fastboot/fastboot
|
|
HOST_ANDROID_TOOLS_DEPENDENCIES += host-zlib host-libselinux
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_HOST_ANDROID_TOOLS_ADB),y)
|
|
HOST_ANDROID_TOOLS_BUILD_TARGETS += adb
|
|
HOST_ANDROID_TOOLS_INSTALL_TARGETS += build-adb/adb
|
|
HOST_ANDROID_TOOLS_DEPENDENCIES += host-zlib host-openssl
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_HOST_ANDROID_TOOLS_EXT4_UTILS),y)
|
|
HOST_ANDROID_TOOLS_BUILD_TARGETS += ext4_utils
|
|
HOST_ANDROID_TOOLS_INSTALL_TARGETS += \
|
|
$(addprefix build-ext4_utils/,make_ext4fs ext4fixup ext2simg img2simg simg2img simg2simg)
|
|
HOST_ANDROID_TOOLS_DEPENDENCIES += host-libselinux
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_ANDROID_TOOLS_FASTBOOT),y)
|
|
ANDROID_TOOLS_TARGETS += fastboot
|
|
ANDROID_TOOLS_DEPENDENCIES += zlib libselinux
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_ANDROID_TOOLS_ADB),y)
|
|
ANDROID_TOOLS_TARGETS += adb
|
|
ANDROID_TOOLS_DEPENDENCIES += zlib openssl
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_ANDROID_TOOLS_ADBD),y)
|
|
ANDROID_TOOLS_TARGETS += adbd
|
|
ANDROID_TOOLS_DEPENDENCIES += zlib openssl
|
|
endif
|
|
|
|
# Build each tool in its own directory not to share object files
|
|
|
|
define HOST_ANDROID_TOOLS_BUILD_CMDS
|
|
$(foreach t,$(HOST_ANDROID_TOOLS_BUILD_TARGETS),\
|
|
mkdir -p $(@D)/build-$(t) && \
|
|
$(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) SRCDIR=$(@D) \
|
|
-C $(@D)/build-$(t) -f $(@D)/debian/makefiles/$(t).mk$(sep))
|
|
endef
|
|
|
|
define ANDROID_TOOLS_BUILD_CMDS
|
|
$(foreach t,$(ANDROID_TOOLS_TARGETS),\
|
|
mkdir -p $(@D)/build-$(t) && \
|
|
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) SRCDIR=$(@D) \
|
|
-C $(@D)/build-$(t) -f $(@D)/debian/makefiles/$(t).mk$(sep))
|
|
endef
|
|
|
|
define HOST_ANDROID_TOOLS_INSTALL_CMDS
|
|
$(foreach t,$(HOST_ANDROID_TOOLS_INSTALL_TARGETS),\
|
|
$(INSTALL) -D -m 0755 $(@D)/$(t) $(HOST_DIR)/bin/$(notdir $(t))$(sep))
|
|
endef
|
|
|
|
define ANDROID_TOOLS_INSTALL_TARGET_CMDS
|
|
$(foreach t,$(ANDROID_TOOLS_TARGETS),\
|
|
$(INSTALL) -D -m 0755 $(@D)/build-$(t)/$(t) $(TARGET_DIR)/usr/bin/$(t)$(sep))
|
|
endef
|
|
|
|
$(eval $(generic-package))
|
|
$(eval $(host-generic-package))
|