Drop old patches
Igor forgot to remove them when he made the last update.
This commit is contained in:
parent
13c7498c8d
commit
bb4d3cca0d
@ -1,58 +0,0 @@
|
||||
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
|
||||
|
@ -1,32 +0,0 @@
|
||||
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
|
||||
|
@ -1,32 +0,0 @@
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user