chan-sccp-b: fix variant build

The variant builing is not working properly because PKG_BUILD_DIR is
unset. This fixes that.

Also the Makefile is cleaned up. LOW_MEMORY is not explicitly defined
anymore because chan-sccp-b is getting the define from the Asterisk
headers.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>

diff --git a/net/chan-sccp-b/Makefile b/net/chan-sccp-b/Makefile
index 3b0e4a88cb0e25d53a7dd5e2f226244ed29da6d9..b26c6f009c649a7410b74cfc9d4fb539896a6f87 100644 (file)
--- a/net/chan-sccp-b/Makefile
+++ b/net/chan-sccp-b/Makefile
@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=chan-sccp-b
 PKG_REV:=6647
 PKG_VERSION:=v4.2.3-r$(PKG_REV)
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://svn.code.sf.net/p/chan-sccp-b/code/branches/v4.2
@@ -19,21 +19,39 @@ PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=$(PKG_REV)
 PKG_SOURCE_PROTO:=svn
 
-PKG_FIXUP:=autoreconf -fi
+PKG_FIXUP:=autoreconf
 
 PKG_LICENSE:=GPL-1.0
 PKG_LICENSE_FILES:=COPYING LICENSE
 PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
 
+PKG_INSTALL:=1
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_BUILD_DEPENDS:=libiconv
+
 include $(INCLUDE_DIR)/package.mk
 
+# musl and glibc include their own iconv, but uclibc does not
+ifneq ($(CONFIG_USE_UCLIBC),)
+TARGET_CPPFLAGS+= \
+       -I$(STAGING_DIR)/usr/lib/libiconv-full/include
+TARGET_LDFLAGS+= \
+       -L$(STAGING_DIR)/usr/lib/libiconv-full/lib -liconv
+endif
+
+CONFIGURE_ARGS += \
+       --enable-optimization=no \
+       --enable-debug=no
+
 define Package/chan-sccp-b/Default
   SUBMENU:=Telephony
   SECTION:=net
   CATEGORY:=Network
   TITLE:=SCCP channel provider support
   URL:=http://chan-sccp-b.sourceforge.net/
-  DEPENDS:= +libltdl
+  DEPENDS:=+USE_UCLIBC:libiconv-full +libltdl
 endef
 
 define Package/asterisk13-chan-sccp-b
@@ -82,13 +100,6 @@ endef
 Package/asterisk11-chan-sccp-b/conffiles = $(Package/conffiles/Default)
 Package/asterisk13-chan-sccp-b/conffiles = $(Package/conffiles/Default)
 
-define Build/Compile
-       $(MAKE) -C "$(PKG_BUILD_DIR)" \
-               CFLAGS="$(CFLAGS) -I$(PKG_BUILD_DIR)/src -DLOW_MEMORY" \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
 define Package/Install/Default
        $(INSTALL_DIR) $(1)/etc/asterisk
        $(CP) ./files/sccp.conf $(1)/etc/asterisk/sccp.conf

diff --git a/net/chan-sccp-b/patches/01-prevent-extra-optimization.patch b/net/chan-sccp-b/patches/01-prevent-extra-optimization.patch
new file mode 100644 (file)
index 0000000..99bca34
--- /dev/null
+++ b/net/chan-sccp-b/patches/01-prevent-extra-optimization.patch
@@ -0,0 +1,33 @@
+--- a/autoconf/extra.m4
++++ b/autoconf/extra.m4
+@@ -471,11 +471,6 @@ AC_DEFUN([CS_ENABLE_OPTIMIZATION], [
+ 
+       LIBBFD=""
+       
+-      if test -n "${CPPFLAGS_saved}"; then
+-              CPPFLAGS_saved="${CPPFLAGS_saved} -U_FORTIFY_SOURCE"
+-      else 
+-              CPPFLAGS_saved="-U_FORTIFY_SOURCE"
+-      fi
+       LDFLAGS_saved="${LDFLAGS}"
+       
+       strip_binaries="no"
+@@ -486,18 +481,6 @@ AC_DEFUN([CS_ENABLE_OPTIMIZATION], [
+               ])
+               CPPFLAGS_saved="${CPPFLAGS_saved} -D_FORTIFY_SOURCE=2"
+               GDB_FLAGS=""
+-      ], [
+-              CFLAGS_saved="`echo ${CFLAGS_saved} |sed -e 's/\-O[0-9]\ \?//g' -e 's/[^|\ ]\-g[$|\ ]//g'`"
+-              dnl CFLAGS_saved="`echo ${CFLAGS_saved} |sed -e 's/\-O[0-9]\ \?//g'`"
+-              optimize_flag="-O0"
+-              case "${CC}" in
+-                      *gcc*)
+-                              AX_CHECK_COMPILE_FLAG(-Og, [
+-                                      optimize_flag="-Og"
+-                              ])
+-                      ;;
+-              esac
+-              CFLAGS_saved="${CFLAGS_saved} ${optimize_flag} "
+       ])
+       
+       AS_IF([test "X${enable_debug}" == "Xyes"], [