net/asterisk-11.x and net/asterisk-13.x: fix LOW_MEMORY, drop patch

[feed/telephony.git] / net / asterisk-13.x / Makefile

diff --git a/net/asterisk-13.x/Makefile b/net/asterisk-13.x/Makefile
index 5d53d6d458c5500eb7df4ba9b5207d863427d2ed..6400c6b0d17bf8e5f4d0307f0e148739e5b21f93 100644 (file)
--- a/net/asterisk-13.x/Makefile
+++ b/net/asterisk-13.x/Makefile
@@ -165,7 +165,7 @@ define Package/asterisk13-sounds/install
        rm -f $(1)/usr/lib/asterisk/sounds/vm-*
 endef
 
-ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk13-chan-dahdi),)
+ifneq ($(CONFIG_PACKAGE_asterisk13-chan-dahdi),)
   CONFIGURE_ARGS+= \
        --with-dahdi="$(STAGING_DIR)/usr" \
        --with-pri="$(STAGING_DIR)/usr" \
@@ -251,7 +251,7 @@ define Build/Configure
                CC="$(HOSTCC)" \
                CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOSTPKG)/include/libxml2" \
                CONFIG_SITE= \
-               LDFLAGS="$(HOST_LDFLAGS)" \
+               LDFLAGS="$(HOST_LDFLAGS) -Wl,-rpath,$(STAGING_DIR_HOSTPKG)/lib" \
                ac_cv_path_ac_pt_CONFIG_LIBXML2=$(STAGING_DIR_HOSTPKG)/bin/xml2-config \
                ./configure \
                $(HOST_CONFIGURE_ARGS) \
@@ -262,12 +262,18 @@ endef
 define Build/Compile
        CC="$(HOSTCC)" \
        CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOSTPKG)/include/libxml2" \
-       LDFLAGS="$(HOST_LDFLAGS)" \
+       LDFLAGS="$(HOST_LDFLAGS) -Wl,-rpath,$(STAGING_DIR_HOSTPKG)/lib" \
        $(MAKE) -C "$(PKG_BUILD_DIR)/menuselect"
+       $(MAKE) -C "$(PKG_BUILD_DIR)" menuselect-tree
+       cd "$(PKG_BUILD_DIR)" && \
+               ./menuselect/menuselect \
+                       --disable BUILD_NATIVE \
+                       --enable LOW_MEMORY \
+                       menuselect.makeopts
        $(MAKE) -C "$(PKG_BUILD_DIR)" \
                include/asterisk/version.h \
                include/asterisk/buildopts.h defaults.h
-       ASTCFLAGS="$(EXTRA_CFLAGS) -DLOW_MEMORY" \
+       ASTCFLAGS="$(EXTRA_CFLAGS)" \
        ASTLDFLAGS="$(EXTRA_LDFLAGS)" \
        $(MAKE) -C "$(PKG_BUILD_DIR)" \
                ASTVARLIBDIR="/usr/lib/asterisk" \