From ed5ad20e6d64bac85a702aa6fd97cda385d152f8 Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Sun, 26 Jul 2015 19:13:22 +0300 Subject: [PATCH] libmongoose: Makefile fixes --- mingw-w64-libmongoose-git/Makefile | 12 ++++++++++-- mingw-w64-libmongoose-git/PKGBUILD | 12 ++++++------ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/mingw-w64-libmongoose-git/Makefile b/mingw-w64-libmongoose-git/Makefile index 8ba469a490..b12985a761 100644 --- a/mingw-w64-libmongoose-git/Makefile +++ b/mingw-w64-libmongoose-git/Makefile @@ -6,6 +6,14 @@ SHARED_LIB=$(LIBNAME)-$(SONAME_MAJOR).dll STATIC_LIB=$(LIBNAME).a IMPORT_LIB=$(LIBNAME).dll.a +ifndef CC + CC=gcc +endif + +ifndef AR + AR=ar +endif + ifndef PREFIX PREFIX=/usr/local endif @@ -30,12 +38,12 @@ SRCS=mongoose.c OBJS=mongoose.o INCLUDE=. -all: $(SHARED_LIB) $(STATIC_LIB) +all: $(STATIC_LIB) $(SHARED_LIB) $(SHARED_LIB): $(OBJS) $(CC) $(OBJS) $(LDFLAGS) -o $(SHARED_LIB) -$(STATIC_LIB): +$(STATIC_LIB): $(OBJS) $(AR) rcs $(STATIC_LIB) $(OBJS) $(OBJS): $(SRCS) diff --git a/mingw-w64-libmongoose-git/PKGBUILD b/mingw-w64-libmongoose-git/PKGBUILD index 8ed756e061..6ad17f5155 100644 --- a/mingw-w64-libmongoose-git/PKGBUILD +++ b/mingw-w64-libmongoose-git/PKGBUILD @@ -1,23 +1,23 @@ # Maintainer: Renato Silva -_realname='libmongoose' +_realname=libmongoose pkgname=(${MINGW_PACKAGE_PREFIX}-${_realname}-git) provides=(${MINGW_PACKAGE_PREFIX}-${_realname}) conflicts=(${MINGW_PACKAGE_PREFIX}-${_realname}) pkgver=r1793.41b405d -pkgrel=2 -url='https://github.com/cesanta/mongoose' +pkgrel=3 +url="https://github.com/cesanta/mongoose" pkgdesc='Embedded web server for C/C++ (mingw-w64)' license=('GPL2') arch=('any') depends=(${MINGW_PACKAGE_PREFIX}-gcc-libs) #${MINGW_PACKAGE_PREFIX}-openssl makedepends=(${MINGW_PACKAGE_PREFIX}-gcc) -source=(${_realname}::'git+https://github.com/cesanta/mongoose' +source=(${_realname}::"git+https://github.com/cesanta/mongoose" mongoose.pc Makefile) sha1sums=('SKIP' '92c82813e7c1b277a0078c0e67addc7e159aec81' - 'c4a55e3cc984dba00258d81e2ab09e8e91ff4419') + '94385286bcb7e3639d03ba283dc43111062c4a23') pkgver() { cd "${srcdir}/${_realname}" @@ -31,7 +31,7 @@ prepare() { build() { cd "${srcdir}/${_realname}" - make PREFIX=${MINGW_PREFIX} CC=gcc -j1 + make PREFIX=${MINGW_PREFIX} CC=gcc AR=ar -j1 } package() {