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

Merge pull request #8577 from neheb/pro

Browse source 
prosody: Change -fPIC to $(FPIC)
This commit is contained in:
Rosen Penev 2019-04-05 14:39:20 -07:00 committed by GitHub
commit 3f53cdf2b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
net/prosody/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=prosody PKG_NAME:=prosody
PKG_VERSION:=0.11.2 PKG_VERSION:=0.11.2
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://prosody.im/downloads/source PKG_SOURCE_URL:=https://prosody.im/downloads/source
@ -30,7 +30,7 @@ define Package/prosody
SUBMENU:=Instant Messaging SUBMENU:=Instant Messaging
DEPENDS:=+luafilesystem +libidn +luaexpat +luasec +libopenssl +libidn +liblua +luabitop DEPENDS:=+luafilesystem +libidn +luaexpat +luasec +libopenssl +libidn +liblua +luabitop
TITLE:=XMPP server TITLE:=XMPP server
URL:=http://prosody.im/ URL:=https://prosody.im/
USERID:=prosody=54:prosody=54 USERID:=prosody=54:prosody=54
endef endef
@ -44,10 +44,10 @@ define Package/prosody/conffiles
/etc/prosody/prosody.cfg.lua /etc/prosody/prosody.cfg.lua
endef endef
TARGET_CFLAGS += $(FPIC) TARGET_CFLAGS += $(FPIC) -std=gnu99
TARGET_LDFLAGS += -shared
TARGET_LDFLAGS += -L$(STAGING_DIR)/usr/lib
MAKE_FLAGS += LD="$(TARGET_CC)"
define Build/Configure define Build/Configure
# this is *NOT* GNU autoconf stuff # this is *NOT* GNU autoconf stuff
@ -57,17 +57,11 @@ define Build/Configure
--with-lua-include="$(STAGING_DIR)/usr/include" \ --with-lua-include="$(STAGING_DIR)/usr/include" \
--with-lua-lib="$(STAGING_DIR)/usr/lib" \ --with-lua-lib="$(STAGING_DIR)/usr/lib" \
--cflags="$(TARGET_CFLAGS)" \ --cflags="$(TARGET_CFLAGS)" \
--ldflags="$(TARGET_LDFLAGS) -llua -lm -ldl -shared" \ --ldflags="$(TARGET_LDFLAGS)" \
--c-compiler="$(CC)" \ --c-compiler="$(CC)" \
--linker="$(LD)" \
--datadir="/etc/prosody/data" \ --datadir="/etc/prosody/data" \
) )
endef endef
# LDFLAGS="$(TARGET_LDFLAGS) -llua -lm -ldl" \
MAKE_FLAGS += \
CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -std=gnu99" \
PREFIX="/usr" \
define Package/prosody/install define Package/prosody/install
$(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_DIR) $(1)/etc/init.d