bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update prosody to 0.3.0, adjust dependencies, thanks to OrazioPirataDelloSpazio

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@14521 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian 2009-02-15 13:52:25 +00:00
parent a7be8a081d
commit e40609739b
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/prosody/Makefile
View File

@ -9,19 +9,19 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=prosody PKG_NAME:=prosody
PKG_VERSION:=0.2.0 PKG_VERSION:=0.3.0
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://prosody.im/downloads/source/ PKG_SOURCE_URL:=http://prosody.im/downloads/source/
PKG_MD5SUM:=825b37b6917e5c21a8596c027e0972ec PKG_MD5SUM:=97b19d75b3d6770fb9b46b6452f945dd
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define Package/prosody define Package/prosody
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
DEPENDS:=+liblua +libidn DEPENDS:=+liblua +libidn +luasocket +luaexpat +luasec
TITLE:=XMPP server TITLE:=XMPP server
URL:=http://prosody.im URL:=http://prosody.im
endef endef

27
net/prosody/patches/001-cross_compile.patch → net/prosody/patches/001-util_src_makefile.patch
View File

@ -1,28 +1,37 @@
diff -urN prosody-0.2.0/util-src/Makefile prosody-0.2.0.new/util-src/Makefile diff -urN prosody-0.3.0/util-src/Makefile prosody-0.3.0.new/util-src/Makefile
--- prosody-0.2.0/util-src/Makefile 2008-12-27 22:54:07.000000000 +0100 --- prosody-0.3.0/util-src/Makefile 2009-02-02 19:05:21.000000000 +0100
+++ prosody-0.2.0.new/util-src/Makefile 2009-01-28 12:25:44.000000000 +0100 +++ prosody-0.3.0.new/util-src/Makefile 2009-02-15 14:44:53.000000000 +0100
@@ -20,18 +20,18 @@ @@ -6,7 +6,7 @@
LUA_LIB?=lua$(LUA_SUFFIX)
IDN_LIB?=idn
OPENSSL_LIB?=crypto
-
+CC=gcc
all: encodings.so hashes.so pposix.so
@@ -21,18 +21,18 @@
rm -f ../util/*.so rm -f ../util/*.so
encodings.o: encodings.c encodings.o: encodings.c
- gcc $(CFLAGS) -I$(LUA_INCDIR) -c -o encodings.o encodings.c - gcc $(CFLAGS) -I$(LUA_INCDIR) -c -o encodings.o encodings.c
+ $(CC) $(CFLAGS) -I$(LUA_INCDIR) -c -o encodings.o encodings.c + $(CC) $(CFLAGS) -I$(LUA_INCDIR) -c -o encodings.o encodings.c
encodings.so: encodings.o encodings.so: encodings.o
- export MACOSX_DEPLOYMENT_TARGET="10.3"; gcc $(LFLAGS) -o encodings.so encodings.o -L/usr/local/lib -llua$(LUA_SUFFIX) -lcrypto -lidn - export MACOSX_DEPLOYMENT_TARGET="10.3"; gcc $(LFLAGS) -o encodings.so encodings.o -L/usr/local/lib -llua$(LUA_SUFFIX) -lidn
+ export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) $(LFLAGS) -o encodings.so encodings.o -L$(STAGING_DIR)/usr/lib -llua$(LUA_SUFFIX) -lcrypto -lidn + export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) $(LFLAGS) -o encodings.so encodings.o -L$(LUA_LIBDIR) -llua$(LUA_SUFFIX) -lidn
hashes.o: hashes.c hashes.o: hashes.c
- gcc $(CFLAGS) -I$(LUA_INCDIR) -c -o hashes.o hashes.c - gcc $(CFLAGS) -I$(LUA_INCDIR) -c -o hashes.o hashes.c
+ $(CC) $(CFLAGS) -I$(LUA_INCDIR) -c -o hashes.o hashes.c + $(CC) $(CFLAGS) -I$(LUA_INCDIR) -c -o hashes.o hashes.c
hashes.so: hashes.o hashes.so: hashes.o
- export MACOSX_DEPLOYMENT_TARGET="10.3"; gcc $(LFLAGS) -o hashes.so hashes.o -L/usr/local/lib -llua$(LUA_SUFFIX) -lcrypto -lssl - export MACOSX_DEPLOYMENT_TARGET="10.3"; gcc $(LFLAGS) -o hashes.so hashes.o -L/usr/local/lib -llua$(LUA_SUFFIX) -lcrypto
+ export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) $(LFLAGS) -o hashes.so hashes.o -L$(STAGING_DIR)/usr/lib -llua$(LUA_SUFFIX) -lcrypto -lssl + export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) $(LFLAGS) -o hashes.so hashes.o -L$(LUA_LIBDIR) -llua$(LUA_SUFFIX) -lcrypto
pposix.o: pposix.c pposix.o: pposix.c
- gcc $(CFLAGS) -I$(LUA_INCDIR) -c -o pposix.o pposix.c - gcc $(CFLAGS) -I$(LUA_INCDIR) -c -o pposix.o pposix.c
+ $(CC) $(CFLAGS) -I$(LUA_INCDIR) -c -o pposix.o pposix.c + $(CC) $(CFLAGS) -I$(LUA_INCDIR) -c -o pposix.o pposix.c
pposix.so: pposix.o pposix.so: pposix.o
- export MACOSX_DEPLOYMENT_TARGET="10.3"; gcc $(LFLAGS) -o pposix.so pposix.o -L/usr/local/lib -llua$(LUA_SUFFIX) - export MACOSX_DEPLOYMENT_TARGET="10.3"; gcc $(LFLAGS) -o pposix.so pposix.o -L/usr/local/lib -llua$(LUA_SUFFIX)
+ export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) $(LFLAGS) -o pposix.so pposix.o -L$(STAGING_DIR)/usr/lib -llua$(LUA_SUFFIX) + export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) $(LFLAGS) -o pposix.so pposix.o -L$(LUA_LIBDIR) -llua$(LUA_SUFFIX)