mongoose: update to 3.7.

This commit is contained in:
Juan RP 2013-04-23 10:10:48 +02:00
parent 56c4b9941d
commit 8cb556aec2
2 changed files with 29 additions and 34 deletions

View File

@ -1,35 +1,30 @@
--- Makefile.orig 2012-06-19 09:55:56.512085441 +0200
+++ Makefile 2012-06-19 10:02:28.949545937 +0200
@@ -22,19 +22,20 @@ all:
### UNIX build: linux, bsd, mac, rtems
##########################################################################
--- Makefile.orig 2013-04-23 09:56:44.031317155 +0200
+++ Makefile 2013-04-23 10:01:52.126993442 +0200
@@ -17,7 +17,9 @@
# -DUSE_LUA - embed Lua in Mongoose (+100kb)
-CFLAGS = -W -Wall -std=c99 -pedantic -O2 $(COPT)
+CFLAGS += -W -Wall -std=c99 -pedantic -O2 $(COPT)
MAC_SHARED = -flat_namespace -bundle -undefined suppress
-LINFLAGS = -ldl -pthread $(CFLAGS)
-LIB = _$(PROG).so
-CC = g++
+LINFLAGS += -ldl -pthread
+LIB ?= lib$(PROG).so.0
+CC ?= gcc
PROG = mongoose
-CFLAGS = -std=c99 -O2 -W -Wall -pedantic -pthread $(COPT)
+LIB = lib$(PROG).so.0
+CFLAGS += -std=c99 -O2 -W -Wall -pedantic -pthread $(COPT)
+
# Make sure that the compiler flags come last in the compilation string.
# If not so, this can break some on some Linux distros which use
# To build with Lua, download and unzip Lua 5.2.1 source code into the
# mongoose directory, and then add $(LUA_SOURCES) to CFLAGS
@@ -79,7 +81,9 @@ all:
# "-Wl,--as-needed" turned on by default in cc command.
# Also, this is turned in many other distros in static linkage builds.
linux:
- $(CC) mongoose.c -shared -fPIC -fpic -o $(LIB) $(LINFLAGS)
- $(CC) mongoose.c main.c -o $(PROG) $(LINFLAGS)
- $(CC) mongoose.c main.c -o $(PROG) -ldl $(CFLAGS)
+ $(CC) mongoose.c -shared -fPIC -fpic -Wl,-soname,$(LIB) \
+ -o $(LIB) $(LINFLAGS) $(CFLAGS)
+ $(CC) main.c -o $(PROG) $(LINFLAGS) -L. $(LIB) $(CFLAGS)
+ -o $(LIB) -ldl -lpthread $(CFLAGS)
+ $(CC) main.c -o $(PROG) -ldl -lpthread -L. $(LIB) $(CFLAGS)
mac: bsd
bsd:
$(CC) mongoose.c -shared -pthread -fpic -fPIC -o $(LIB) $(CFLAGS)
@@ -50,6 +51,18 @@ solaris:
gcc mongoose.c main.c -pthread -lnsl -lsocket -o $(PROG) $(CFLAGS)
@@ -94,6 +98,18 @@ bsd_yassl:
solaris:
$(CC) mongoose.c main.c -lnsl -lsocket -o $(PROG) $(CFLAGS)
+install:
+ install -d $(DESTDIR)$(PREFIX)/include
@ -41,8 +36,8 @@
+ ln -sf $(LIB) libmongoose.so; cp -a libmongoose.so $(DESTDIR)$(PREFIX)/lib
+ install -m755 $(LIB) $(DESTDIR)$(PREFIX)/lib
+ install -d $(DESTDIR)$(PREFIX)/$(MANDIR)/man1
+ install -m644 mongoose.1 $(DESTDIR)$(PREFIX)/$(MANDIR)/man1
+ -install -m644 mongoose.1 $(DESTDIR)$(PREFIX)/$(MANDIR)/man1
+
##########################################################################
### WINDOWS build: Using Visual Studio or Mingw
##########################################################################
# For codesign to work in non-interactive mode, unlock login keychain:
# security unlock ~/Library/Keychains/login.keychain
# See e.g. http://lists.apple.com/archives/apple-cdsa/2008/Jan/msg00027.html

View File

@ -1,7 +1,7 @@
# Template file for 'mongoose'
pkgname=mongoose
version=3.1
revision=3
version=3.7
revision=1
wrksrc=$pkgname
build_style=gnu-makefile
make_build_args="linux"
@ -11,21 +11,21 @@ maintainer="Juan RP <xtraeme@gmail.com>"
license="MIT"
homepage="https://code.google.com/p/mongoose/"
distfiles="https://mongoose.googlecode.com/files/mongoose-$version.tgz"
checksum=fd003ff722d8b654a6ceaaadeffb1806d2d513afe888ba00ecfb4a115897844c
checksum=8376ede0378b6dd80ded78953726e9d3c18a2a8fd1a52a03efe949fd09d2ea68
long_desc="
Mongoose is easy to use web server. It also can be used as embedded web server
library to provide web interface to applications."
mongoose-devel_package() {
depends="libmongoose>=$version"
short_desc="${short_desc} -- development files"
short_desc="An Easy to use Web server -- development files"
pkg_install() {
vmove usr/include
}
}
libmongoose_package() {
short_desc="${short_desc} -- shared library"
short_desc="An Easy to use Web server -- shared library"
pkg_install() {
vmove usr/lib
}
@ -33,6 +33,6 @@ libmongoose_package() {
mongoose_package() {
pkg_install() {
vmove usr
vmove all
}
}