Your message dated Fri, 14 Nov 2014 09:49:06 +0000
with message-id <[email protected]>
and subject line Bug#764579: fixed in minetest 0.4.10+repack-2
has caused the Debian Bug report #764579,
regarding minetest: FTBFS on hurd-i386
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
764579: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=764579
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: minetest
Version: 0.4.10+repack-1
Severity: important
Tags: patch
User: [email protected]
Usertags: hurd
Hi,
minetest fails to build on GNU/Hurd due to a name clash with OSX/Apple,
both are defining the __MACH__ keyword. This package has built
previously, and the latest building version is 0.4.9+repack-6. The
attached patch fixes the build problems for version 0.4.10+repack-1.
Thanks!
--- a/src/cguittfont/irrUString.h 2014-07-07 00:06:06.000000000 +0200
+++ b/src/cguittfont/irrUString.h 2014-10-08 08:22:35.000000000 +0200
@@ -45,7 +45,7 @@
#define __BYTE_ORDER 0
#define __LITTLE_ENDIAN 0
#define __BIG_ENDIAN 1
-#elif __MACH__
+#elif defined(__MACH__) && defined(__APPLE__)
#include <machine/endian.h>
#else
#include <endian.h>
--- a/src/jthread/jevent.h 2014-07-07 00:06:06.000000000 +0200
+++ b/src/jthread/jevent.h 2014-10-08 08:38:33.000000000 +0200
@@ -30,7 +30,7 @@
#ifdef _WIN32
#include <windows.h>
-#elif __MACH__
+#elif defined(__MACH__) && defined(__APPLE__)
#include <mach/mach.h>
#include <mach/task.h>
#include <mach/semaphore.h>
@@ -43,7 +43,7 @@
class Event {
#ifdef _WIN32
HANDLE hEvent;
-#elif __MACH__
+#elif defined(__MACH__) && defined(__APPLE__)
semaphore_t sem;
#else
sem_t sem;
--- a/src/jthread/pthread/jevent.cpp 2014-07-07 00:06:06.000000000 +0200
+++ b/src/jthread/pthread/jevent.cpp 2014-10-08 08:27:50.000000000 +0200
@@ -29,7 +29,7 @@
#define UNUSED(expr) do { (void)(expr); } while (0)
-#ifdef __MACH__
+#if defined(__MACH__) && defined(__APPLE__)
#undef sem_t
#define sem_t semaphore_t
#undef sem_init
--- a/src/jthread/jsemaphore.h 2014-07-07 00:06:06.000000000 +0200
+++ b/src/jthread/jsemaphore.h 2014-10-08 08:29:13.000000000 +0200
@@ -24,7 +24,7 @@
#include <windows.h>
#include <assert.h>
#define MAX_SEMAPHORE_COUNT 1024
-#elif __MACH__
+#elif defined(__MACH__) && defined(__APPLE__)
#include <pthread.h>
#include <mach/mach.h>
#include <mach/task.h>
@@ -52,7 +52,7 @@
private:
#if defined(WIN32)
HANDLE m_hSemaphore;
-#elif __MACH__
+#elif defined(__MACH__) && defined(__APPLE__)
semaphore_t m_semaphore;
int semcount;
#else
--- a/src/jthread/pthread/jsemaphore.cpp 2014-07-07 00:06:06.000000000 +0200
+++ b/src/jthread/pthread/jsemaphore.cpp 2014-10-08 08:30:53.000000000 +0200
@@ -20,13 +20,13 @@
#include <errno.h>
#include <sys/time.h>
#include "jthread/jsemaphore.h"
-#ifdef __MACH__
+#if defined(__MACH__) && defined(__APPLE__)
#include <unistd.h>
#endif
#define UNUSED(expr) do { (void)(expr); } while (0)
-#ifdef __MACH__
+#if defined(__MACH__) && defined(__APPLE__)
#undef sem_t
#undef sem_init
#undef sem_wait
@@ -44,7 +44,7 @@
int sem_init_retval = sem_init(&m_semaphore,0,0);
assert(sem_init_retval == 0);
UNUSED(sem_init_retval);
-#ifdef __MACH__
+#if defined(__MACH__) && defined(__APPLE__)
semcount = 0;
#endif
}
@@ -73,7 +73,7 @@
int sem_post_retval = sem_post(&m_semaphore);
assert(sem_post_retval == 0);
UNUSED(sem_post_retval);
-#ifdef __MACH__
+#if defined(__MACH__) && defined(__APPLE__)
pthread_mutex_lock(&semcount_mutex);
semcount++;
pthread_mutex_unlock(&semcount_mutex);
@@ -84,7 +84,7 @@
int sem_wait_retval = sem_wait(&m_semaphore);
assert(sem_wait_retval == 0);
UNUSED(sem_wait_retval);
-#ifdef __MACH__
+#if defined(__MACH__) && defined(__APPLE__)
pthread_mutex_lock(&semcount_mutex);
semcount--;
pthread_mutex_unlock(&semcount_mutex);
@@ -92,7 +92,7 @@
}
bool JSemaphore::Wait(unsigned int time_ms) {
-#ifdef __MACH__
+#if defined(__MACH__) && defined(__APPLE__)
mach_timespec_t waittime;
waittime.tv_sec = time_ms / 1000;
waittime.tv_nsec = 1000000 * (time_ms % 1000);
@@ -106,14 +106,14 @@
return false;
}
-#ifndef __MACH__
+#if !(defined(__MACH__) && defined(__APPLE__))
waittime.tv_nsec = ((time_ms % 1000) * 1000 * 1000) + (now.tv_usec * 1000);
waittime.tv_sec = (time_ms / 1000) + (waittime.tv_nsec / (1000*1000*1000)) + now.tv_sec;
waittime.tv_nsec %= 1000*1000*1000;
#endif
errno = 0;
-#ifdef __MACH__
+#if defined(__MACH__) && defined(__APPLE__)
int sem_wait_retval = semaphore_timedwait(m_semaphore, waittime);
#else
int sem_wait_retval = sem_timedwait(&m_semaphore, &waittime);
@@ -121,7 +121,7 @@
if (sem_wait_retval == 0)
{
-#ifdef __MACH__
+#if defined(__MACH__) && defined(__APPLE__)
pthread_mutex_lock(&semcount_mutex);
semcount--;
pthread_mutex_unlock(&semcount_mutex);
@@ -137,7 +137,7 @@
int JSemaphore::GetValue() {
int retval = 0;
-#ifdef __MACH__
+#if defined(__MACH__) && defined(__APPLE__)
pthread_mutex_lock(&semcount_mutex);
retval = semcount;
pthread_mutex_unlock(&semcount_mutex);
--- a/src/porting.h 2014-07-07 00:06:06.000000000 +0200
+++ b/src/porting.h 2014-10-08 08:59:43.000000000 +0200
@@ -59,7 +59,7 @@
#include <unistd.h>
#include <stdint.h> //for uintptr_t
- #if (defined(linux) || defined(__linux)) && !defined(_GNU_SOURCE)
+#if (defined(linux) || defined(__linux) || defined(__GNU__)) && !defined(_GNU_SOURCE)
#define _GNU_SOURCE
#endif
@@ -227,7 +227,7 @@
#else // Posix
#include <sys/time.h>
#include <time.h>
-#ifdef __MACH__
+#if defined(__MACH__) && defined(__APPLE__)
#include <mach/clock.h>
#include <mach/mach.h>
#endif
@@ -257,7 +257,7 @@
{
struct timespec ts;
// from http://stackoverflow.com/questions/5167269/clock-gettime-alternative-in-mac-os-x
-#ifdef __MACH__ // OS X does not have clock_gettime, use clock_get_time
+#if defined(__MACH__) && defined(__APPLE__) // OS X does not have clock_gettime, use clock_get_time
clock_serv_t cclock;
mach_timespec_t mts;
host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock);
@@ -359,6 +359,9 @@
}
#elif defined(_WIN32)
inline void setThreadName(const char* name) {}
+#elif defined(__GNU__)
+ //#warning "GNU/Hurd platform, pthread_setname_np not yet supported"
+ inline void setThreadName(const char* name) {}
#else
#warning "Unrecognized platform, thread names will not be available."
inline void setThreadName(const char* name) {}
--- End Message ---
--- Begin Message ---
Source: minetest
Source-Version: 0.4.10+repack-2
We believe that the bug you reported is fixed in the latest version of
minetest, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Martin Quinson <[email protected]> (supplier of updated minetest package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Fri, 14 Nov 2014 10:14:16 +0100
Source: minetest
Binary: minetest minetest-dbg minetest-server minetest-data
Architecture: source amd64 all
Version: 0.4.10+repack-2
Distribution: unstable
Urgency: medium
Maintainer: Debian Games Team <[email protected]>
Changed-By: Martin Quinson <[email protected]>
Description:
minetest - Multiplayer infinite-world block sandbox
minetest-data - Multiplayer infinite-world block sandbox (data files)
minetest-dbg - Multiplayer infinite-world block sandbox (debugging symbols)
minetest-server - Multiplayer infinite-world block sandbox (server)
Closes: 764579
Changes:
minetest (0.4.10+repack-2) unstable; urgency=medium
.
* d/p/hurd.patch: new patch to fix FTBFS on Hurd (Closes: #764579)
Thanks to Svante Signell for the report and the patch.
Checksums-Sha1:
7844fd8619584213799a3be06ca4445f9d61fc71 2458 minetest_0.4.10+repack-2.dsc
24db96e81b7c9a749b35aa5ab006a3f3027a047f 25972
minetest_0.4.10+repack-2.debian.tar.xz
b616e1b00e180ca2a282aab502bc21e9de3f88f8 1907242
minetest_0.4.10+repack-2_amd64.deb
c3c8c3da9068491689f351a6cbf8a204f24e67ca 34956818
minetest-dbg_0.4.10+repack-2_amd64.deb
9382238a1872b0ed1733573bd2b6c690235ca1d5 1282858
minetest-server_0.4.10+repack-2_amd64.deb
30464d086681de88528a7e63db1afe31be182c82 1172450
minetest-data_0.4.10+repack-2_all.deb
Checksums-Sha256:
e7ae56ad153269392ff4b748a4493d918ef510d894732bbd8cf7daa0bb852569 2458
minetest_0.4.10+repack-2.dsc
9fe5a123d8ea2dfaa8ade05c1f3b92d0d8a9d9450158c7768fd9c5cf558e9cdc 25972
minetest_0.4.10+repack-2.debian.tar.xz
d0c70e4d1561e459f66055fdeb95488eff62e11a6fd8d4d82df4d2b8b93612f2 1907242
minetest_0.4.10+repack-2_amd64.deb
4457c0e2cc59bed203e3b91ecca4f5284eb73e258c0dc70549adf077a28e5946 34956818
minetest-dbg_0.4.10+repack-2_amd64.deb
bc8cf2553dc1fe6957c75d959554fe69c00876909b3c880a9785d515bcac7b56 1282858
minetest-server_0.4.10+repack-2_amd64.deb
fae64aacbf0b7316dc6b0840426b8e8a5372263ec3733e5f77a5aba392f7d060 1172450
minetest-data_0.4.10+repack-2_all.deb
Files:
8fcf5c2257440c03e0bb846cd69a44c5 2458 games extra minetest_0.4.10+repack-2.dsc
6a86178e3b4f889272f09c318d09095c 25972 games extra
minetest_0.4.10+repack-2.debian.tar.xz
79347af1e841128e19d86f61849a4692 1907242 games extra
minetest_0.4.10+repack-2_amd64.deb
2adc380cb7aea91d24e77d4124fab4cd 34956818 debug extra
minetest-dbg_0.4.10+repack-2_amd64.deb
e02ba774746971fc54c835a08da813fd 1282858 games extra
minetest-server_0.4.10+repack-2_amd64.deb
bcb87edd42247c19613354e9f1098f7e 1172450 games extra
minetest-data_0.4.10+repack-2_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAEBCAAGBQJUZc0aAAoJEJi9lyRPc76n1x4P/jjXIT98Baz8yYNao7/D6leR
28CQAcL0j9zw4C7QfmcB/35BJfanERHGJMnsUJez2KaMSA7GKkw5VcnR3pxBRBmU
5GDtPBjGFxtiwADia7wW3xdNU2p+pAOIFCfiWmQSNiJvxKnFBIXKA/w6CWkzfcpu
kxq7FXPrNufXPCVpX4LCIPen9qJ6l1R+TzbReMnUZLB1LVovY1sEwG3i3WJi97zd
QP5JArJzKNAtDFFGarXBwE6nYWCrBGumATe1HX5yuXmbAQ8NpCdazrWzHcTnQe/4
HsziF37W+3Jvv7Yvy2zVqxVE8OeLftM8bpBWYRhDjlFynpVfcAJQTj5Uwgizf9nW
1XrnT/fUIlTMSSV0M6amZhr2c3fIsbwnTqEhuV0Ll2kUZG3nFn/QbU1rTggxciAk
kq5CRgsZhqVMIoXMlaHUNecZGq7Gm0qZ8aRMrbbXAeAlA2Vkkvc10I+PM/4nrPdP
p5NK0OCm3rWz5MkziC94kgm33JOBDSQuUHsc1kCWP7AOEK4XgeFNaP1ml9/+aSeE
/DXpY6gVqWdt/hTgHYJOwykfA2rMSB9bUcagXbY18Y9bnYFlvUILB/3Bqc6OsoZ+
vbdR+DjLpLBrZyjPuKv37vEIBFx550WTJPOcRJ48S7jOwd+mexGhwq8Y73hpH+sF
EseNOo8H/79ZW9I5cdSt
=/YjS
-----END PGP SIGNATURE-----
--- End Message ---
