libeXosip2: convert to autotargets and bump to 3.3.0
cover libeXosip2: convert to autotargets and bump to 3.3.0
Both patches are needed for this to work properly.
Martin
[PATCH 1/2] libosip2: change site location and bump to 3.3.0 [PATCH 2/2] libeXosip2: convert to autotargets and bump to 3.3.0
PATCH 1/2 libosip2: change site location and bump to 3.3.0
Change the site location to debian mirror to get the latest debian patches.
Signed-off-by Martin Banky <[email protected]>
--- package/libosip2/libosip2.mk | 26 ++++++++++++++++++-------- 1 files changed, 18 insertions(+), 8 deletions(-)
package/libosip2/libosip2.mk +18 -8
@@ -3,14 +3,24 @@ # libosip2 # ############################################################# -LIBOSIP2_VERSION=3.1.0 -LIBOSIP2_SOURCE=libosip2-$(LIBOSIP2_VERSION).tar.gz -LIBOSIP2_SITE=http://www.antisip.com/download/exosip2 -LIBOSIP2_INSTALL_STAGING=YES +LIBOSIP2_VERSION = 3.3.0 +LIBOSIP2_SOURCE = libosip2_$(LIBOSIP2_VERSION).orig.tar.gz +LIBOSIP2_PATCH = libosip2_$(LIBOSIP2_VERSION)-1.diff.gz +LIBOSIP2_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/libo/libosip2 +LIBOSIP2_INSTALL_STAGING = YES -LIBOSIP2_CONF_OPT = \ - --with-gnu-ld \ - --enable-shared \ - --enable-static +ifneq ($(LIBOSIP2_PATCH),) +define LIBOSIP2_DEBIAN_PATCHES + if [ -d $(@D)/debian/patches ]; then \ + (cd $(@D)/debian/patches && for i in *; \ + do $(SED) 's,^\+\+\+ .*cvs-$(LIBOSIP2_VERSION)/,+++ cvs-$(LIBOSIP2_VERSION)/,' $$i; \ + done; \ + ); \ + toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*; \ + fi +endef +endif + +LIBOSIP2_POST_PATCH_HOOKS += LIBOSIP2_DEBIAN_PATCHES $(eval $(call AUTOTARGETS,package,libosip2))
Signature · 1 line
1.7.3.1
PATCH 2/2 libeXosip2: convert to autotargets and bump to 3.3.0
In reply to Martin BankySigned-off-by Martin Banky <[email protected]>
--- package/libeXosip2/libeXosip2.mk | 109 +++++++------------------------------ 1 files changed, 21 insertions(+), 88 deletions(-)
package/libeXosip2/libeXosip2.mk +21 -88
@@ -3,93 +3,26 @@ # libeXosip2 # ############################################################# +LIBEXOSIP2_VERSION = 3.3.0 +LIBEXOSIP2_SOURCE = libexosip2_$(LIBEXOSIP2_VERSION).orig.tar.gz +LIBEXOSIP2_PATCH = libexosip2_$(LIBEXOSIP2_VERSION)-1.diff.gz +LIBEXOSIP2_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/libe/libexosip2 +LIBEXOSIP2_INSTALL_STAGING = YES + +LIBEXOSIP2_DEPENDENCIES = host-pkg-config libosip2 + +ifneq ($(LIBEXOSIP2_PATCH),) +define LIBEXOSIP2_DEBIAN_PATCHES + if [ -d $(@D)/debian/patches ]; then \ + (cd $(@D)/debian/patches && for i in *; \ + do $(SED) 's,^\+\+\+ .*cvs-$(LIBEXOSIP2_VERSION)/,+++ cvs-$(LIBEXOSIP2_VERSION)/,' $$i; \ + done; \ + ); \ + toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*; \ + fi +endef +endif -LIBEXOSIP2_VERSION=3.1.0 -LIBEXOSIP2_SOURCE=libeXosip2-$(LIBEXOSIP2_VERSION).tar.gz -LIBEXOSIP2_SITE=http://www.antisip.com/download/exosip2 -LIBEXOSIP2_DIR=$(BUILD_DIR)/libeXosip2-$(LIBEXOSIP2_VERSION) -LIBEXOSIP2_CAT:=$(ZCAT) - -$(DL_DIR)/$(LIBEXOSIP2_SOURCE): - $(call DOWNLOAD,$(LIBEXOSIP2_SITE),$(LIBEXOSIP2_SOURCE)) - -$(LIBEXOSIP2_DIR)/.unpacked: $(DL_DIR)/$(LIBEXOSIP2_SOURCE) - $(LIBEXOSIP2_CAT) $(DL_DIR)/$(LIBEXOSIP2_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - $(CONFIG_UPDATE) $(LIBEXOSIP2_DIR) - touch $(LIBEXOSIP2_DIR)/.unpacked - -$(LIBEXOSIP2_DIR)/.configured: $(LIBEXOSIP2_DIR)/.unpacked - (cd $(LIBEXOSIP2_DIR); rm -rf config.cache; \ - $(TARGET_CONFIGURE_OPTS) \ - $(TARGET_CONFIGURE_ARGS) \ - ./configure $(QUIET) \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --prefix=/usr \ - --enable-shared \ - --enable-static \ - $(DISABLE_NLS) \ - ) - touch $@ - -$(LIBEXOSIP2_DIR)/.compiled: $(LIBEXOSIP2_DIR)/.configured - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(LIBEXOSIP2_DIR) - touch $@ - -#LDFLAGS=$(TARGET_LDFLAGS) - -$(STAGING_DIR)/usr/lib/libeXosip2.so: $(LIBEXOSIP2_DIR)/.compiled - cp -dpf $(LIBEXOSIP2_DIR)/src/.libs/libeXosip2.so* $(STAGING_DIR)/usr/lib - touch $@ - -$(STAGING_DIR)/usr/lib/libeXosip2.a: $(LIBEXOSIP2_DIR)/.compiled - cp -dpf $(LIBEXOSIP2_DIR)/src/.libs/libeXosip2.a $(STAGING_DIR)/usr/lib - cp -dpf $(LIBEXOSIP2_DIR)/include/*.h $(STAGING_DIR)/usr/include - touch $@ - -$(STAGING_DIR)/usr/lib/libeXosip2.la: $(LIBEXOSIP2_DIR)/.compiled - cp -dpf $(LIBEXOSIP2_DIR)/src/libeXosip2.la $(STAGING_DIR)/usr/lib - $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libeXosip2.la - touch $@ - -$(STAGING_DIR)/usr/bin/sip_reg: $(LIBEXOSIP2_DIR)/.compiled - cp -dpf $(LIBEXOSIP2_DIR)/tools/.libs/sip_reg $(STAGING_DIR)/usr/bin - touch $@ - - -$(TARGET_DIR)/usr/lib/libeXosip2.so: $(STAGING_DIR)/usr/lib/libeXosip2.so - mkdir -p $(TARGET_DIR)/usr/lib - cp -dpf $(STAGING_DIR)/usr/lib/libeXosip2.so* $(TARGET_DIR)/usr/lib/ - $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libeXosip2.so* - touch $@ - -$(TARGET_DIR)/usr/bin/sip_reg: $(STAGING_DIR)/usr/bin/sip_reg - mkdir -p $(TARGET_DIR)/usr/bin - cp -dpf $(STAGING_DIR)/usr/bin/sip_reg $(TARGET_DIR)/usr/bin - touch $@ - - - -libeXosip2: host-pkg-config libosip2 $(TARGET_DIR)/usr/lib/libeXosip2.so - -libeXosip2-source: $(DL_DIR)/$(LIBEXOSIP2_SOURCE) - -libeXosip2-clean: - -$(MAKE) -C $(LIBEXOSIP2_DIR) clean - -rm -f $(STAGING_DIR)/usr/lib/libeXosip2.* - -rm -f $(TARGET_DIR)/usr/lib/libeXosip2.* - - -libeXosip2-dirclean: - rm -rf $(LIBEXOSIP2_DIR) +LIBEXOSIP2_POST_PATCH_HOOKS += LIBEXOSIP2_DEBIAN_PATCHES -.PHONY: libeXosip2-headers libeXosip2-target-headers -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_PACKAGE_LIBEXOSIP2),y) -TARGETS+=libeXosip2 -endif +$(eval $(call AUTOTARGETS,package,libeXosip2))
Signature · 1 line
1.7.3.1
cover libeXosip2: convert to autotargets and bump to 3.3.0
In reply to Martin BankyQuoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Martin" == Martin Banky <[email protected]> writes:
Martin> Both patches are needed for this to work properly.
Committed both, thanks.
Signature · 1 line
Bye, Peter Korsgaard