Difuse/telephony
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

asterisk-g72x: fix variant build

Browse source 
Currently variant building isn't working properly because PKG_BUILD_DIR
is not set. This commit fixes that.

It also cleans up the Makefile, making it much simpler. The cleanups are
already in master.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
This commit is contained in:
Sebastian Kemper 2018-01-11 20:28:18 +01:00
parent 37f40d02b8
commit 07b7459194
1 changed files with 14 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
net/asterisk-g72x/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=asterisk-g72x PKG_NAME:=asterisk-g72x
PKG_VERSION:=1.3 PKG_VERSION:=1.3
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=asterisk-g72x-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=asterisk-g72x-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://asterisk.hosting.lv/src/ PKG_SOURCE_URL:=http://asterisk.hosting.lv/src/
@ -23,6 +23,8 @@ PKG_LICENSE:=GPL-3.0
PKG_LICENSE_FILES:=README.md PKG_LICENSE_FILES:=README.md
PKG_MAINTAINER:=Alex Samorukov <samm@os2.kiev.ua> PKG_MAINTAINER:=Alex Samorukov <samm@os2.kiev.ua>
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define Package/asterisk-g72x/Default define Package/asterisk-g72x/Default
@ -60,52 +62,26 @@ Package/asterisk18-codec-g729/description = $(Package/description/Default)
Package/asterisk11-codec-g729/description = $(Package/description/Default) Package/asterisk11-codec-g729/description = $(Package/description/Default)
Package/asterisk13-codec-g729/description = $(Package/description/Default) Package/asterisk13-codec-g729/description = $(Package/description/Default)
ifeq ($(BUILD_VARIANT),asterisk18) CONFIGURE_ARGS += \
MAKE_ARGS:= \
CC="$(TARGET_CC)" \
LD="$(TARGET_LD)" \
CFLAGS="$(TARGET_CFLAGS) -DASTERISK_VERSION_NUM=110000 -DLOW_MEMORY -D_XOPEN_SOURCE=600 $(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include/asterisk-1.8/include -DHAVE_CONFIG_H -I. -fPIC" \
LDFLAGS="$(TARGET_LDFLAGS)" \
DESTDIR="$(PKG_INSTALL_DIR)"
CONFIGURE_ARGS+=\
--with-asterisk-includes=$(STAGING_DIR)/usr/include/asterisk-1.8/include \
--with-asterisk18 \
--with-bcg729 \ --with-bcg729 \
--enable-shared \ --enable-shared
$(MAKE_ARGS)
ifeq ($(BUILD_VARIANT),asterisk18)
CONFIGURE_ARGS += \
--with-asterisk-includes=$(STAGING_DIR)/usr/include/asterisk-1.8/include \
--with-asterisk18
endif endif
ifeq ($(BUILD_VARIANT),asterisk11) ifeq ($(BUILD_VARIANT),asterisk11)
MAKE_ARGS:= \ CONFIGURE_ARGS += \
CC="$(TARGET_CC)" \
LD="$(TARGET_LD)" \
CFLAGS="$(TARGET_CFLAGS) -DASTERISK_VERSION_NUM=110000 -DLOW_MEMORY -D_XOPEN_SOURCE=600 $(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include/asterisk-11/include -DHAVE_CONFIG_H -I. -fPIC" \
LDFLAGS="$(TARGET_LDFLAGS)" \
DESTDIR="$(PKG_INSTALL_DIR)"
CONFIGURE_ARGS+=\
--with-asterisk-includes=$(STAGING_DIR)/usr/include/asterisk-11/include \ --with-asterisk-includes=$(STAGING_DIR)/usr/include/asterisk-11/include \
--with-asterisk100 \ --with-asterisk100
--with-bcg729 \
--enable-shared \
$(MAKE_ARGS)
endif endif
ifeq ($(BUILD_VARIANT),asterisk13) ifeq ($(BUILD_VARIANT),asterisk13)
MAKE_ARGS:= \ CONFIGURE_ARGS += \
CC="$(TARGET_CC)" \
LD="$(TARGET_LD)" \
CFLAGS="$(TARGET_CFLAGS) -DASTERISK_VERSION_NUM=130000 -DLOW_MEMORY -D_XOPEN_SOURCE=600 $(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include/asterisk-13/include -DHAVE_CONFIG_H -I. -fPIC" \
LDFLAGS="$(TARGET_LDFLAGS)" \
DESTDIR="$(PKG_INSTALL_DIR)"
CONFIGURE_ARGS+=\
--with-asterisk-includes=$(STAGING_DIR)/usr/include/asterisk-13/include \ --with-asterisk-includes=$(STAGING_DIR)/usr/include/asterisk-13/include \
--with-asterisk130 \ --with-asterisk130
--with-bcg729 \
--enable-shared \
$(MAKE_ARGS)
endif endif
define Package/Install/Default define Package/Install/Default