revert bad change

[openwrt.git] / package / pjsip / Makefile

diff --git a/package/pjsip/Makefile b/package/pjsip/Makefile
index 42db149..97a5771 100644 (file)
--- a/package/pjsip/Makefile
+++ b/package/pjsip/Makefile
@@ -8,13 +8,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pjsip
-PKG_VERSION:=1.8.5
-PKG_RELEASE:=2
+PKG_VERSION:=1.12
+PKG_RELEASE:=1
 
 PKG_SOURCE:=pjproject-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.pjsip.org/release/$(PKG_VERSION)/
-PKG_MD5SUM:=f9aa9e58b4d697245eb4bfa7d81a54a3
+PKG_MD5SUM:=1db8e5a5dd73b216409b15afa34651a4
+
 PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/pjproject-$(PKG_VERSION)
 
@@ -36,6 +38,7 @@ CONFIGURE_PREFIX=/usr/pjsip-$(BUILD_VARIANT)
 
 ifeq ($(BUILD_VARIANT),oss)
 CONFIGURE_ARGS += \
+       --disable-floating-point \
        --enable-g711-codec \
        --disable-l16-codec \
        --disable-g722-codec \
@@ -51,6 +54,7 @@ endif
 
 ifeq ($(BUILD_VARIANT),ltq-tapi)
 CONFIGURE_ARGS += \
+       --disable-floating-point \
        --enable-g711-codec \
        --disable-l16-codec \
        --disable-g722-codec \
@@ -65,14 +69,15 @@ CONFIGURE_ARGS += \
 EXTRA_CFLAGS:=-I$(STAGING_DIR)/usr/include/drv_tapi -I$(STAGING_DIR)/usr/include/drv_vmmc
 endif
 
-Package/pjsip-oss=$(call Package/pjsip-template,oss,)
+Package/pjsip-oss=$(call Package/pjsip-template,oss,BROKEN)
 Package/pjsip-ltq-tapi=$(call Package/pjsip-template,ltq-tapi,@TARGET_lantiq +TARGET_lantiq:kmod-ltq-tapi +TARGET_lantiq:kmod-ltq-vmmc)
 
+USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)
+ifneq ($(USE_LOCAL),)
 define Build/Prepare
-       $(PKG_UNPACK)
-       $(Build/Patch)
-       $(CP) ./src/* $(PKG_BUILD_DIR)
+       $(CP) ./src/*  $(PKG_BUILD_DIR)
 endef
+endif
 
 define Build/Configure
        (cd $(PKG_BUILD_DIR); autoconf aconfigure.ac > aconfigure)
@@ -80,15 +85,15 @@ define Build/Configure
 endef
 
 define Build/Compile
-       CFLAGS="$(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
-       LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS) $(LIBGCC_S)" \
-               $(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH)
+       CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
+       CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
+       LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS) $(LIBGCC_S) -lm" \
+               $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/$(MAKE_PATH)
 endef
 
 define Build/InstallDev
-       $(INSTALL_DIR) $(1)/usr/
-       $(CP) $(PKG_INSTALL_DIR)/usr/pjsip-$(BUILD_VARIANT) \
-               $(1)/usr/
+       $(INSTALL_DIR) $(1)/usr
+       $(CP) $(PKG_INSTALL_DIR)/usr/pjsip-$(BUILD_VARIANT) $(1)/usr
 endef
 
 define Package/pjsip-$(BUILD_VARIANT)/install