main/libev: add pkgconfig file, respect CFLAGS

4 files changed, 144 insertions, 5 deletions

diff --git a/main/libev/APKBUILD b/main/libev/APKBUILD
index dac739b571..066e6aed48 100644
--- a/main/libev/APKBUILD
+++ b/main/libev/APKBUILD
@@ -2,17 +2,21 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libev
 pkgver=4.11
-pkgrel=0
+pkgrel=1
 pkgdesc="event dispatch library"
 url="http://libev.schmorp.de/"
 arch="all"
 license="BSD GPL"
 depends=
 depends_dev=
-makedepends="$depends_dev"
+makedepends="$depends_dev autoconf automake libtool"
 install=""
 subpackages="$pkgname-dev $pkgname-doc"
-source="http://dist.schmorp.de/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+source="http://dist.schmorp.de/${pkgname}/${pkgname}-${pkgver}.tar.gz
+	libev-4.11-Add-pkgconfig-support.patch
+	libev-4.11-Modernize-the-configure.ac.patch
+	libev-4.11-Respect-the-CFLAGS-if-defined.patch
+	"
 
 _builddir="${srcdir}/${pkgname}-${pkgver}"
 prepare() {
@@ -23,6 +27,8 @@ prepare() {
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
 		esac
 	done
+	libtoolize --force && aclocal && autoconf && autoheader \
+		&& automake --add-missing
 }
 
 build() {
@@ -34,9 +40,20 @@ build() {
 
 package() {
 	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make -j1 DESTDIR="$pkgdir" install || return 1
 	rm "$pkgdir"/usr/include/event.h \
 		"$pkgdir"/usr/lib/*.la
 }
 
-md5sums="cda69b858a1849dfe6ce17c930cf10cd  libev-4.11.tar.gz"
+md5sums="cda69b858a1849dfe6ce17c930cf10cd  libev-4.11.tar.gz
+acec6b40b5ebea613fb0829f84e8a48b  libev-4.11-Add-pkgconfig-support.patch
+7e4870998ed6e0d1350181c906c7aef5  libev-4.11-Modernize-the-configure.ac.patch
+4fc88fe789946b6cf44a04dc4d39cfc2  libev-4.11-Respect-the-CFLAGS-if-defined.patch"
+sha256sums="9f55f16ff6e4d60a1b1fa7f4962af69768468f0d7c362aab6387f52020938cdf  libev-4.11.tar.gz
+2228eb682631655678e172a647238bf9c00b5ea8e732b45795e45fe5d79e1ffb  libev-4.11-Add-pkgconfig-support.patch
+b7e38bc90a2f1b688726ef24382d4c65f6381b0708f1f674bcc1c8df1df4e2d6  libev-4.11-Modernize-the-configure.ac.patch
+c581f42f82c9d63a1a9d56d64de35eadd40773cfa1f076594b4c48cd6b1533cc  libev-4.11-Respect-the-CFLAGS-if-defined.patch"
+sha512sums="802d9f28781140ccb2634e80b7ca73f694203d95da0b4d3ee38edff4c89db94d3073a61a7b95af0ede5865ade6b48f4960c9f33ba73e088779eedd1e396a8817  libev-4.11.tar.gz
+b5bc1b5ed1e605cd45a01adce70c1a97188c0b46a36333f12eccd4407c95d96f18adff90ee8c5733c1783a36b4adc5ef67d6b470104339a1ac5c4539a2a4599e  libev-4.11-Add-pkgconfig-support.patch
+bc4070d8bce60aa65f93aa000bf186f21604880d0c1c4f096a036f6d72d2a2b2a2513e9fc7375515ce73bbae7ea9baec0369dc2978720a13a317dc713fdc6f81  libev-4.11-Modernize-the-configure.ac.patch
+caeb95c0610f93f8cba6e3d06414b004ce9d19bacda0164d823b079ba7a0395be46718bb5f0479456bf5c31a63aa6d74ba4a4395f632de34a5dc68738bdbf3d9  libev-4.11-Respect-the-CFLAGS-if-defined.patch"
diff --git a/main/libev/libev-4.11-Add-pkgconfig-support.patch b/main/libev/libev-4.11-Add-pkgconfig-support.patch
new file mode 100644
index 0000000000..8c478caeee
--- /dev/null
+++ b/main/libev/libev-4.11-Add-pkgconfig-support.patch
@@ -0,0 +1,58 @@
+From 01d2c386b58afa49567ccc079c963f76dc2e60f3 Mon Sep 17 00:00:00 2001
+From: Mathieu Bridon <bochecha@fedoraproject.org>
+Date: Fri, 8 Feb 2013 15:40:51 +0800
+Subject: [PATCH] Add pkgconfig support
+
+---
+ Makefile.am  |  4 ++++
+ configure.ac |  2 +-
+ libev.pc.in  | 11 +++++++++++
+ 3 files changed, 16 insertions(+), 1 deletion(-)
+ create mode 100644 libev.pc.in
+
+diff --git a/Makefile.am b/Makefile.am
+index 059305b..9e556c0 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -11,6 +11,10 @@ man_MANS = ev.3
+ 
+ include_HEADERS = ev.h ev++.h event.h
+ 
++pkgconfigdir = $(libdir)/pkgconfig
++
++pkgconfig_DATA = libev.pc
++
+ lib_LTLIBRARIES = libev.la
+ 
+ libev_la_SOURCES = ev.c event.c
+diff --git a/configure.ac b/configure.ac
+index 31d0a25..1af149a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -21,5 +21,5 @@ AC_PROG_LIBTOOL
+ 
+ m4_include([libev.m4])
+ 
+-AC_CONFIG_FILES([Makefile])
++AC_CONFIG_FILES([Makefile libev.pc])
+ AC_OUTPUT
+diff --git a/libev.pc.in b/libev.pc.in
+new file mode 100644
+index 0000000..3b6c636
+--- /dev/null
++++ b/libev.pc.in
+@@ -0,0 +1,11 @@
++prefix=@prefix@
++exec_prefix=@prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: libev
++Description: High-performance event loop/event model
++Version: @VERSION@
++Libs: -L${libdir} -lev
++Libs.private: 
++Cflags: -I${includedir}
+-- 
+1.8.1
+
diff --git a/main/libev/libev-4.11-Modernize-the-configure.ac.patch b/main/libev/libev-4.11-Modernize-the-configure.ac.patch
new file mode 100644
index 0000000000..45d088107b
--- /dev/null
+++ b/main/libev/libev-4.11-Modernize-the-configure.ac.patch
@@ -0,0 +1,32 @@
+From 7ddb7d52d0398f31b8b54d4a1fb572d9ee666a52 Mon Sep 17 00:00:00 2001
+From: Mathieu Bridon <bochecha@fedoraproject.org>
+Date: Fri, 8 Feb 2013 16:29:13 +0800
+Subject: [PATCH] Modernize the configure.ac
+
+Without it, Automake 1.13 and above will refuse it.
+
+See the details for AM_INIT_AUTOMAKE at:
+   http://www.gnu.org/software/automake/manual/automake.html#Public-Macros
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1af149a..a87761f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,9 +1,9 @@
+ orig_CFLAGS="$CFLAGS"
+ 
+-AC_INIT
++AC_INIT([libev], [4.11])
+ AC_CONFIG_SRCDIR([ev_epoll.c])
+ 
+-AM_INIT_AUTOMAKE(libev,4.11) dnl also update ev.h!
++AM_INIT_AUTOMAKE
+ AC_CONFIG_HEADERS([config.h])
+ AM_MAINTAINER_MODE
+ 
+-- 
+1.8.1
+
diff --git a/main/libev/libev-4.11-Respect-the-CFLAGS-if-defined.patch b/main/libev/libev-4.11-Respect-the-CFLAGS-if-defined.patch
new file mode 100644
index 0000000000..6c977357fb
--- /dev/null
+++ b/main/libev/libev-4.11-Respect-the-CFLAGS-if-defined.patch
@@ -0,0 +1,32 @@
+From c7106c0dfb3c7692f7a928b18b2d1bd1b0e10d76 Mon Sep 17 00:00:00 2001
+From: Mathieu Bridon <bochecha@fedoraproject.org>
+Date: Fri, 8 Feb 2013 17:12:55 +0800
+Subject: [PATCH] Respect the CFLAGS if defined
+
+https://bugzilla.redhat.com/show_bug.cgi?id=908096
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index a87761f..827aa4a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,5 +1,3 @@
+-orig_CFLAGS="$CFLAGS"
+-
+ AC_INIT([libev], [4.11])
+ AC_CONFIG_SRCDIR([ev_epoll.c])
+ 
+@@ -7,6 +5,8 @@ AM_INIT_AUTOMAKE
+ AC_CONFIG_HEADERS([config.h])
+ AM_MAINTAINER_MODE
+ 
++orig_CFLAGS="$CFLAGS"
++
+ AC_PROG_CC
+ 
+ dnl Supply default CFLAGS, if not specified
+-- 
+1.8.1
+