diff options
| author | Rosen Penev <rosenp@gmail.com> | 2019-04-02 19:06:39 -0700 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2019-04-05 14:30:06 -0700 |
| commit | 3deb14bf5bf4f772ebb252d53c27150e5750ffb7 (patch) | |
| tree | e5586b72eea50dadbc75dc3cb8c8edb4232dfe9b /net | |
| parent | 139ecea4d156e1e4ddbd3dc5fe9cc4b745bf3535 (diff) | |
prosody: Change linker from LD to CC
This is causing linking errors on i3486 and maybe other platforms. Linking
with LD does not seem to be very portable.
Also cleaned up the Makefile by getting rid of whitespace, HTTPS,
duplicated entries, etc...
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/prosody/Makefile | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/net/prosody/Makefile b/net/prosody/Makefile index f102735de..c5c0d8913 100644 --- a/net/prosody/Makefile +++ b/net/prosody/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=prosody PKG_VERSION:=0.11.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://prosody.im/downloads/source @@ -30,7 +30,7 @@ define Package/prosody SUBMENU:=Instant Messaging DEPENDS:=+luafilesystem +libidn +luaexpat +luasec +libopenssl +libidn +liblua +luabitop TITLE:=XMPP server - URL:=http://prosody.im/ + URL:=https://prosody.im/ USERID:=prosody=54:prosody=54 endef @@ -44,10 +44,10 @@ define Package/prosody/conffiles /etc/prosody/prosody.cfg.lua endef -TARGET_CFLAGS += $(FPIC) - -TARGET_LDFLAGS += -L$(STAGING_DIR)/usr/lib +TARGET_CFLAGS += $(FPIC) -std=gnu99 +TARGET_LDFLAGS += -shared +MAKE_FLAGS += LD="$(TARGET_CC)" define Build/Configure # this is *NOT* GNU autoconf stuff @@ -57,17 +57,11 @@ define Build/Configure --with-lua-include="$(STAGING_DIR)/usr/include" \ --with-lua-lib="$(STAGING_DIR)/usr/lib" \ --cflags="$(TARGET_CFLAGS)" \ - --ldflags="$(TARGET_LDFLAGS) -llua -lm -ldl -shared" \ + --ldflags="$(TARGET_LDFLAGS)" \ --c-compiler="$(CC)" \ - --linker="$(LD)" \ --datadir="/etc/prosody/data" \ ) endef -# LDFLAGS="$(TARGET_LDFLAGS) -llua -lm -ldl" \ - -MAKE_FLAGS += \ - CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -std=gnu99" \ - PREFIX="/usr" \ define Package/prosody/install $(INSTALL_DIR) $(1)/etc/init.d @@ -124,7 +118,7 @@ define Package/prosody/postinst paxctl -v /usr/bin/ > /dev/null 2>&1 [ $$? -ne 0 ] && { cp /usr/bin/lua /tmp - paxctl -c -m /tmp/lua > /dev/null 2>&1 + paxctl -c -m /tmp/lua > /dev/null 2>&1 cp -f /tmp/lua /usr/bin/lua } } |