* [Buildroot] [PATCH] empty: bump to version 0.6.20b
@ 2017-05-03 12:01 Baruch Siach
2017-05-03 15:24 ` Peter Korsgaard
0 siblings, 1 reply; 2+ messages in thread
From: Baruch Siach @ 2017-05-03 12:01 UTC (permalink / raw)
To: buildroot
Drop upstream patch.
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
package/empty/0002-fix-non-thread-build.patch | 49 ---------------------------
package/empty/empty.hash | 2 +-
package/empty/empty.mk | 2 +-
3 files changed, 2 insertions(+), 51 deletions(-)
delete mode 100644 package/empty/0002-fix-non-thread-build.patch
diff --git a/package/empty/0002-fix-non-thread-build.patch b/package/empty/0002-fix-non-thread-build.patch
deleted file mode 100644
index a7e8d90a212f..000000000000
--- a/package/empty/0002-fix-non-thread-build.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-empty uses SysV semaphores, so the ifdef is wrong here.
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
---- empty-0.6.19b.orig/empty.c 2012-09-19 13:24:05.000000000 +0200
-+++ empty-0.6.19b/empty.c 2015-07-09 02:00:09.000000000 +0200
-@@ -179,25 +179,23 @@ int main (int argc, char *argv[]) {
- 2 - unknown */
-
- /* semaphores */
--#ifdef _POSIX_SEMAPHORES
-- #if defined(__linux__) && defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)
-- /* union semun is defined by including <sys/sem.h> */
-- #else
-- union semun {
-- int val;
-- struct semid_ds *buf;
-- #ifdef __SVR4
-- ushort_t *array;
-- #endif
-- #ifdef __hpux__
-- ushort *array;
-- #endif
-- #ifdef __linux__
-- unsigned short *array;
-- struct seminfo *__buf; /* buffer for IPC_INFO */
-- #endif
-- };
-- #endif
-+#if defined(__linux__) && defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)
-+ /* union semun is defined by including <sys/sem.h> */
-+#else
-+ union semun {
-+ int val;
-+ struct semid_ds *buf;
-+ #ifdef __SVR4
-+ ushort_t *array;
-+ #endif
-+ #ifdef __hpux__
-+ ushort *array;
-+ #endif
-+ #ifdef __linux__
-+ unsigned short *array;
-+ struct seminfo *__buf; /* buffer for IPC_INFO */
-+ #endif
-+ };
- #endif
- union semun semu;
-
diff --git a/package/empty/empty.hash b/package/empty/empty.hash
index 91402889fa5e..e62939687db7 100644
--- a/package/empty/empty.hash
+++ b/package/empty/empty.hash
@@ -1,2 +1,2 @@
# Locally computed:
-sha256 05b7cb361ef815774abda325c09c573f8c9039ccbb71eedc743439e4637c314a empty-0.6.19b.tgz
+sha256 7e6636e400856984c4405ce7bd0843aaa3329fa3efd20c58df8400a9eaa35f09 empty-0.6.20b.tgz
diff --git a/package/empty/empty.mk b/package/empty/empty.mk
index a1cc3c0526a3..5e3ed42befd4 100644
--- a/package/empty/empty.mk
+++ b/package/empty/empty.mk
@@ -4,7 +4,7 @@
#
################################################################################
-EMPTY_VERSION = 0.6.19b
+EMPTY_VERSION = 0.6.20b
EMPTY_SOURCE = empty-$(EMPTY_VERSION).tgz
EMPTY_SITE = http://downloads.sourceforge.net/project/empty/empty/empty-$(EMPTY_VERSION)
EMPTY_LICENSE = BSD-3-Clause
--
2.11.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Buildroot] [PATCH] empty: bump to version 0.6.20b
2017-05-03 12:01 [Buildroot] [PATCH] empty: bump to version 0.6.20b Baruch Siach
@ 2017-05-03 15:24 ` Peter Korsgaard
0 siblings, 0 replies; 2+ messages in thread
From: Peter Korsgaard @ 2017-05-03 15:24 UTC (permalink / raw)
To: buildroot
>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes:
> Drop upstream patch.
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-05-03 15:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-03 12:01 [Buildroot] [PATCH] empty: bump to version 0.6.20b Baruch Siach
2017-05-03 15:24 ` Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.