This patch includes * mingw-w64-headers/include/winnt.h: compile fixes for1 gcc-4.9.3 * mingw-w64-headers/crt/math.h: Likewise * mingw-w64-headers/crt/float.h (FLT_EPSILON,DBL_EPSILON,LDBL_EPSILON): Add symbols. * mingw-w64-headers/crt/stat.h (S_ISLNK,S_ISSOCK,S_ISUID,S_ISGID,S_ISLINK): Add symbols. (lstat): Add function. * mingw-w64-headers/crt/_mingw_stat64.h: Likewise * mingw-w64-headers/crt/stdlib.h (realpath): Add function. Needed for building with gcc-4.9.3 and using with cross-libtool-2.4.6. Upstream status: not yet presented upstream. diff --git a/mingw-w64-headers/crt/float.h b/mingw-w64-headers/crt/float.h index 5874f4e..bdf4ead 100644 --- a/mingw-w64-headers/crt/float.h +++ b/mingw-w64-headers/crt/float.h @@ -22,6 +22,15 @@ #if (__GNUC__ < 4) #error Corrupt install of gcc-s internal headers, or search order was changed. #else + + /* From gcc-4.9.3 float.h. */ + #undef FLT_EPSILON + #undef DBL_EPSILON + #undef LDBL_EPSILON + #define FLT_EPSILON __FLT_EPSILON__ + #define DBL_EPSILON __DBL_EPSILON__ + #define LDBL_EPSILON __LDBL_EPSILON__ + /* #include_next */ /* Number of decimal digits, q, such that any floating-point number with q diff --git a/mingw-w64-headers/crt/math.h b/mingw-w64-headers/crt/math.h index 1e970f4..99a332f 100644 --- a/mingw-w64-headers/crt/math.h +++ b/mingw-w64-headers/crt/math.h @@ -216,6 +216,7 @@ extern "C" { #endif } +#if 0 __CRT_INLINE long double __cdecl fabsl (long double x) { #ifdef __arm__ @@ -226,6 +227,7 @@ extern "C" { return res; #endif } +#endif __CRT_INLINE double __cdecl fabs (double x) { @@ -905,7 +907,7 @@ __mingw_choose_expr ( \ /* 7.12.7.3 */ extern double __cdecl hypot (double, double) __MINGW_ATTRIB_DEPRECATED_MSVC2005; /* in libmoldname.a */ extern float __cdecl hypotf (float x, float y); -#ifndef __CRT__NO_INLINE +#if 0 //ndef __CRT__NO_INLINE __CRT_INLINE float __cdecl hypotf (float x, float y) { return (float) hypot ((double)x, (double)y);} #endif extern long double __cdecl hypotl (long double, long double); e3599d33a7aceff'>gnu/build/jami-service.scm
AgeCommit message (Expand)Author
2021-08-30build/jami-service: Fix range ends in account-fingerprint-rx....This broke compilation of Guix with guile@3.0.2 with: In procedure make-regexp: Invalid range end The fix is to replace [0-9A-f] with [0-9A-Fa-f]. * gnu/build/jami-service.scm (account-fingerprint-rx): Correct regexp. Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com> Maxime Devos
2021-08-02Reinstate "services: Add a service for Jami."...This reverts commit 4673f817938d9d2b1b40a072ab2e0c44a32ccc97, which reverted commit 69dcc24c9f0cdfea674eb690e7755d26a25ced2b with the fix detailed below. Thanks to Christopher Baines for reporting the failure and proposing a fix. * guix/self.scm (compiled-guix) [*system-test-modules*]: Add the test data files via the 'extra-files' argument. * gnu/local.mk (dist_patch_DATA): Move the tests/data/jami-dummy-account.dat file to... * gnu/local.mk (MODULES_NOT_COMPILED): ... here. Maxim Cournoyer
2021-08-02Revert "services: Add a service for Jami."...This reverts commit 69dcc24c9f0cdfea674eb690e7755d26a25ced2b. It broke 'guix pull'. Maxim Cournoyer
2021-08-02services: Add a service for Jami....* gnu/services/telephony.scm (string-or-computed-file?) (string-list?, account-fingerprint-list?): New procedures. (maybe-string-list, maybe-account-fingerprint-list) (maybe-boolean, maybe-string, jami-account-list): New configuration field types. (serialize-string-list, serialize-boolean, serialize-string) (jami-account, jami-account->alist, jami-configuration) (jami-account-list?, jami-account-list-maybe): New procedures. (%jami-accounts): New variable. (jami-configuration->command-line-arguments): New procedure. (jami-dbus-session-activation, jami-shepherd-services): New procedures. (jami-service-type): New variable. * gnu/build/jami-service.scm: New file. * gnu/tests/data/jami-dummy-account.dat: Likewise. * gnu/tests/telephony.scm: Likewise. * gnu/local.mk (GNU_SYSTEM_MODULES): Register them. * Makefile.am (SCM_TESTS): Register the test file. (dist_patch_DATA): Register the new data file. * doc/guix.texi (Telephony Services): Document it. Maxim Cournoyer