commit: b659cdcbbde0f414aa968759f30bcc507793d4a4 Author: Oz N Tiram <oz.tiram <AT> gmail <DOT> com> AuthorDate: Sun Oct 3 18:38:04 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Oct 18 04:10:26 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b659cdcb
dev-libs/libuev: split patch to two Signed-off-by: Oz N Tiram <oz.tiram <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/22469 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-libs/libuev/files/libuev-64-bit-times.patch | 32 ---------------------- dev-libs/libuev/files/libuev-fix-tests.patch | 9 ++++++ dev-libs/libuev/files/libuev-large-files-fix.patch | 9 ++++++ dev-libs/libuev/libuev-2.3.2-r1.ebuild | 3 +- 4 files changed, 20 insertions(+), 33 deletions(-) diff --git a/dev-libs/libuev/files/libuev-64-bit-times.patch b/dev-libs/libuev/files/libuev-64-bit-times.patch deleted file mode 100644 index b018da1ef70..00000000000 --- a/dev-libs/libuev/files/libuev-64-bit-times.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 786f502..c9859b1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1,4 +1,4 @@ --AC_INIT(libuev, 2.4.0-beta1, https://github.com/troglobit/libuev/issues) -+AC_INIT(libuev, 2.4.0-rc1, https://github.com/troglobit/libuev/issues) - AC_CONFIG_AUX_DIR(aux) - AM_INIT_AUTOMAKE([1.11 foreign dist-xz]) - AM_SILENT_RULES([yes]) -diff --git a/src/libuev.pc.in b/src/libuev.pc.in -index 9f831a6..4b00176 100644 ---- a/src/libuev.pc.in -+++ b/src/libuev.pc.in -@@ -8,5 +8,5 @@ Description: Simple event loop for Linux - Version: @VERSION@ - Requires: - Libs: -L${libdir} -luev --Cflags: -I${includedir} -+Cflags: -I${includedir} -D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64 - -diff --git a/test/Makefile.am b/test/Makefile.am -index 72fdfb4..6bbfc85 100644 ---- a/test/Makefile.am -+++ b/test/Makefile.am -@@ -12,5 +12,5 @@ TESTS += event - - check_PROGRAMS = $(TESTS) - --CPPFLAGS = -D_GNU_SOURCE -+CPPFLAGS = -D_GNU_SOURCE -D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64 - LDADD = -L../src ../src/libuev.la diff --git a/dev-libs/libuev/files/libuev-fix-tests.patch b/dev-libs/libuev/files/libuev-fix-tests.patch new file mode 100644 index 00000000000..68e4b2c4fd6 --- /dev/null +++ b/dev-libs/libuev/files/libuev-fix-tests.patch @@ -0,0 +1,9 @@ +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -14,5 +14,5 @@ check_PROGRAMS = $(TESTS) + + # Ignore warnings about unused result, in e.g. write() + CFLAGS = -W -Wall -Wextra -Wno-unused-result -Wno-unused-parameter +-CPPFLAGS = -D_GNU_SOURCE ++CPPFLAGS = -D_GNU_SOURCE -D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64 + LDADD = -L../src ../src/libuev.la diff --git a/dev-libs/libuev/files/libuev-large-files-fix.patch b/dev-libs/libuev/files/libuev-large-files-fix.patch new file mode 100644 index 00000000000..61a4cdb3ed2 --- /dev/null +++ b/dev-libs/libuev/files/libuev-large-files-fix.patch @@ -0,0 +1,9 @@ +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -1,6 +1,6 @@ + lib_LTLIBRARIES = libuev.la + libuev_la_SOURCES = uev.c uev.h private.h io.c timer.c signal.c cron.c event.c +-libuev_la_CPPFLAGS = -D_GNU_SOURCE -D_TIME_BITS=64 ++libuev_la_CPPFLAGS = -D_GNU_SOURCE -D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64 + libuev_la_CFLAGS = -W -Wall -Wextra -std=gnu11 + libuev_la_LDFLAGS = $(AM_LDFLAGS) -version-info 4:0:2 diff --git a/dev-libs/libuev/libuev-2.3.2-r1.ebuild b/dev-libs/libuev/libuev-2.3.2-r1.ebuild index 14f468a0569..2cd8e6b9f81 100644 --- a/dev-libs/libuev/libuev-2.3.2-r1.ebuild +++ b/dev-libs/libuev/libuev-2.3.2-r1.ebuild @@ -13,7 +13,8 @@ KEYWORDS="~amd64 ~x86" IUSE="static-libs" PATCHES=( - "${FILESDIR}/${P}-64-bit-time.patch" + "${FILESDIR}/${PN}"-fix-tests.patch + "${FILESDIR}/${PN}"-large-files-fix.patch ) src_configure() {
