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

Merge pull request #225 from micmac1/baresip

Browse source 
baresip: fix build failure on 32bit x86 targets
This commit is contained in:
Jiri Slachta 2017-12-12 12:04:18 +01:00 committed by GitHub
commit 94b7a831af
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libs/re/Makefile
View file

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=re PKG_NAME:=re
PKG_VERSION:=0.5.6 PKG_VERSION:=0.5.6
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.creytiv.com/pub PKG_SOURCE_URL:=http://www.creytiv.com/pub
@ -41,6 +41,9 @@ endef
# CFLAGS are picked up from the environment, as well as CPPFLAGS (and LD etc.). # CFLAGS are picked up from the environment, as well as CPPFLAGS (and LD etc.).
# But LDFLAGS aren't picked up, so they need to be handed over via # But LDFLAGS aren't picked up, so they need to be handed over via
# EXTRA_LFLAGS. # EXTRA_LFLAGS.
#
# LD is changed to TARGET_CC to fix build failures on x86 32bit. Without this
# there's no linking to ssp, which results in undefined references.
ifneq ($(CONFIG_USE_GLIBC)$(CONFIG_USE_MUSL),) ifneq ($(CONFIG_USE_GLIBC)$(CONFIG_USE_MUSL),)
TARGET_CFLAGS+=-D_GNU_SOURCE TARGET_CFLAGS+=-D_GNU_SOURCE
@ -48,6 +51,7 @@ endif
MAKE_FLAGS+= \ MAKE_FLAGS+= \
EXTRA_LFLAGS="$(TARGET_LDFLAGS)" \ EXTRA_LFLAGS="$(TARGET_LDFLAGS)" \
LD="$(TARGET_CC)" \
SYSROOT="$(shell $(FIND) $(TOOLCHAIN_DIR) -path '*/include/pthread.h' | sed -ne '1s|/include/pthread.h||p')" \ SYSROOT="$(shell $(FIND) $(TOOLCHAIN_DIR) -path '*/include/pthread.h' | sed -ne '1s|/include/pthread.h||p')" \
SYSROOT_ALT="$(STAGING_DIR)/usr" \ SYSROOT_ALT="$(STAGING_DIR)/usr" \
RELEASE=1 RELEASE=1

11
libs/re/patches/003-fix-linker-call.patch
View file

@ -1,11 +0,0 @@
--- a/mk/re.mk
+++ b/mk/re.mk
@@ -235,7 +235,7 @@ ifeq ($(OS),linux)
LFLAGS += -fPIC
SH_LFLAGS += -shared
MOD_LFLAGS +=
- APP_LFLAGS += -rdynamic
+ APP_LFLAGS += --export-dynamic
AR := ar
AFLAGS := crD
endif

3
libs/rem/Makefile
View file

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=rem PKG_NAME:=rem
PKG_VERSION:=0.5.2 PKG_VERSION:=0.5.2
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.creytiv.com/pub PKG_SOURCE_URL:=http://www.creytiv.com/pub
@ -35,6 +35,7 @@ endef
MAKE_FLAGS+= \ MAKE_FLAGS+= \
EXTRA_LFLAGS="$(TARGET_LDFLAGS)" \ EXTRA_LFLAGS="$(TARGET_LDFLAGS)" \
LD="$(TARGET_CC)" \
LIBRE_MK="$(STAGING_DIR)/usr/share/re/re.mk" \ LIBRE_MK="$(STAGING_DIR)/usr/share/re/re.mk" \
LIBRE_INC="$(STAGING_DIR)/usr/include/re" \ LIBRE_INC="$(STAGING_DIR)/usr/include/re" \
LIBRE_SO="$(STAGING_DIR)/usr/lib" \ LIBRE_SO="$(STAGING_DIR)/usr/lib" \

3
net/baresip/Makefile
View file

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=baresip PKG_NAME:=baresip
PKG_VERSION:=0.5.6 PKG_VERSION:=0.5.6
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.creytiv.com/pub PKG_SOURCE_URL:=http://www.creytiv.com/pub
@ -93,6 +93,7 @@ BARESIP_MOD_OPTIONS:= \
MAKE_FLAGS+= \ MAKE_FLAGS+= \
EXTRA_LFLAGS="$(TARGET_LDFLAGS)" \ EXTRA_LFLAGS="$(TARGET_LDFLAGS)" \
LD="$(TARGET_CC)" \
LIBRE_MK="$(STAGING_DIR)/usr/share/re/re.mk" \ LIBRE_MK="$(STAGING_DIR)/usr/share/re/re.mk" \
LIBRE_INC="$(STAGING_DIR)/usr/include/re" \ LIBRE_INC="$(STAGING_DIR)/usr/include/re" \
LIBRE_SO="$(STAGING_DIR)/usr/lib" \ LIBRE_SO="$(STAGING_DIR)/usr/lib" \

3
net/restund/Makefile
View file

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=restund PKG_NAME:=restund
PKG_VERSION:=0.4.12 PKG_VERSION:=0.4.12
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.creytiv.com/pub PKG_SOURCE_URL:=http://www.creytiv.com/pub
@ -48,6 +48,7 @@ RESTUND_MOD_OPTIONS:= \
MAKE_FLAGS+= \ MAKE_FLAGS+= \
EXTRA_LFLAGS="$(TARGET_LDFLAGS)" \ EXTRA_LFLAGS="$(TARGET_LDFLAGS)" \
LD="$(TARGET_CC)" \
LIBRE_MK="$(STAGING_DIR)/usr/share/re/re.mk" \ LIBRE_MK="$(STAGING_DIR)/usr/share/re/re.mk" \
LIBRE_INC="$(STAGING_DIR)/usr/include/re" \ LIBRE_INC="$(STAGING_DIR)/usr/include/re" \
LIBRE_SO="$(STAGING_DIR)/usr/lib" \ LIBRE_SO="$(STAGING_DIR)/usr/lib" \