Skip to content

Commit

Permalink
poco: bump to version 1.7.2
Browse files Browse the repository at this point in the history
Also:
 - add a hash file.
 - replace patch #2 by passing the DEFAULT_TARGET to poco
 - remove patch #3 as it is obsolet since upstream commit
   010f7a5370be450109f1726e39d5b193e63a6373
 - remove patch #0004 which is applied upstream
 - remove patch #0005 which is fixed by upstream different

Signed-off-by: Jörg Krause <[email protected]>
Signed-off-by: Thomas Petazzoni <[email protected]>
  • Loading branch information
joerg-krause authored and tpetazzoni committed Apr 13, 2016
1 parent ce86f9e commit add7c43
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 195 deletions.
33 changes: 0 additions & 33 deletions package/poco/0002-poco-don-t-build-debug-libraries.patch

This file was deleted.

This file was deleted.

72 changes: 0 additions & 72 deletions package/poco/0004-fix-unbundled-pcre-usage.patch

This file was deleted.

29 changes: 0 additions & 29 deletions package/poco/0005-add-missing-LIBPREFIX-definition.patch

This file was deleted.

2 changes: 2 additions & 0 deletions package/poco/poco.hash
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Locally computed
sha256 cfd311ecbc9e58accf1c4ea70170af88f92f88e73dd14944e528e7f6229e6cab poco-poco-1.7.2-release.tar.gz
21 changes: 16 additions & 5 deletions package/poco/poco.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
################################################################################

POCO_VERSION = poco-1.6.1-release
POCO_VERSION = poco-1.7.2-release
POCO_SITE = $(call github,pocoproject,poco,$(POCO_VERSION))
POCO_LICENSE = Boost-v1.0
POCO_LICENSE_FILES = LICENSE
Expand Down Expand Up @@ -37,6 +37,14 @@ ifeq ($(BR2_sh4a)$(BR2_nios2),y)
POCO_CONF_OPTS += --no-fpenvironment
endif

ifeq ($(BR2_STATIC_LIBS),y)
POCO_MAKE_TARGET = static_release
else ifeq ($(BR2_SHARED_LIBS),y)
POCO_MAKE_TARGET = shared_release
else ifeq ($(BR2_SHARED_STATIC_LIBS),y)
POCO_MAKE_TARGET = all_release
endif

define POCO_CONFIGURE_CMDS
(cd $(@D); ./configure \
--config=Linux \
Expand All @@ -49,17 +57,20 @@ define POCO_CONFIGURE_CMDS
endef

define POCO_BUILD_CMDS
$(MAKE1) POCO_TARGET_OSARCH=$(ARCH) CROSS_COMPILE=$(TARGET_CROSS) \
$(MAKE) POCO_TARGET_OSARCH=$(ARCH) CROSS_COMPILE=$(TARGET_CROSS) \
MYSQL_LIBDIR=$(STAGING_DIR)/usr/lib/mysql \
MYSQL_INCDIR=$(STAGING_DIR)/usr/include/mysql -C $(@D)
MYSQL_INCDIR=$(STAGING_DIR)/usr/include/mysql \
DEFAULT_TARGET=$(POCO_MAKE_TARGET) -C $(@D)
endef

define POCO_INSTALL_STAGING_CMDS
$(MAKE) DESTDIR=$(STAGING_DIR) POCO_TARGET_OSARCH=$(ARCH) install -C $(@D)
$(MAKE) DESTDIR=$(STAGING_DIR) POCO_TARGET_OSARCH=$(ARCH) \
DEFAULT_TARGET=$(POCO_MAKE_TARGET) install -C $(@D)
endef

define POCO_INSTALL_TARGET_CMDS
$(MAKE) DESTDIR=$(TARGET_DIR) POCO_TARGET_OSARCH=$(ARCH) install -C $(@D)
$(MAKE) DESTDIR=$(TARGET_DIR) POCO_TARGET_OSARCH=$(ARCH) \
DEFAULT_TARGET=$(POCO_MAKE_TARGET) install -C $(@D)
endef

$(eval $(generic-package))

0 comments on commit add7c43

Please sign in to comment.