diff options
| author | khronosschoty <khronosschoty@posteo.org> | 2018-11-02 13:33:37 +0000 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2018-11-03 07:46:41 +0700 |
| commit | d17bbffe86ddcdf998b130e8b6d90cc532c0b29d (patch) | |
| tree | 0f23115e3d3cd2a2e368cadf50309e4abc496b0d | |
| parent | 8fbf713f4f5fe608f14abdf570a337f082ba701b (diff) | |
| download | slackbuilds-d17bbffe86ddcdf998b130e8b6d90cc532c0b29d.tar.gz | |
development/gcclegacy494: Patched to build with glibc-2.28.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
| -rw-r--r-- | development/gcclegacy494/gcclegacy494.SlackBuild | 3 | ||||
| -rw-r--r-- | development/gcclegacy494/ustat.h.patch | 47 |
2 files changed, 49 insertions, 1 deletions
diff --git a/development/gcclegacy494/gcclegacy494.SlackBuild b/development/gcclegacy494/gcclegacy494.SlackBuild index 2264f3b0ca..1c1fb412a8 100644 --- a/development/gcclegacy494/gcclegacy494.SlackBuild +++ b/development/gcclegacy494/gcclegacy494.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=gcclegacy494 VERSION=${VERSION:-4.9.4} -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} TAG=${TAG:-_SBo} INSTLOC=${INSTLOC:-/opt/$PRGNAM} @@ -124,6 +124,7 @@ if [ "$minor" -gt "23" ]; then patch -p1 -i "$CWD/942-asan-fix-missing-include-signal-h.patch" patch -p1 -i "$CWD/943-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch" patch -p1 -i "$CWD/944-sanitizer-linux.patch" + patch -p1 -i "$CWD/ustat.h.patch" if [ "$minor" = "26" ]; then export glibcxx_cv_c99_math=yes fi diff --git a/development/gcclegacy494/ustat.h.patch b/development/gcclegacy494/ustat.h.patch new file mode 100644 index 0000000000..e22c33ef9f --- /dev/null +++ b/development/gcclegacy494/ustat.h.patch @@ -0,0 +1,47 @@ +*** a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc 2018-10-31 11:20:33.419203838 -0700 +--- b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc 2018-10-31 12:18:50.202725160 -0700 +*************** +*** 81,87 **** + #include <sys/statvfs.h> + #include <sys/timex.h> + #include <sys/user.h> +- #include <sys/ustat.h> + #include <linux/cyclades.h> + #include <linux/if_eql.h> + #include <linux/if_plip.h> +--- 81,86 ---- +*************** +*** 163,172 **** + unsigned struct_old_utsname_sz = sizeof(struct old_utsname); + unsigned struct_oldold_utsname_sz = sizeof(struct oldold_utsname); + unsigned struct_itimerspec_sz = sizeof(struct itimerspec); +- unsigned struct_ustat_sz = sizeof(struct ustat); + #endif // SANITIZER_LINUX + + #if SANITIZER_LINUX && !SANITIZER_ANDROID + unsigned struct_rlimit64_sz = sizeof(struct rlimit64); + unsigned struct_timex_sz = sizeof(struct timex); + unsigned struct_msqid_ds_sz = sizeof(struct msqid_ds); +--- 162,183 ---- + unsigned struct_old_utsname_sz = sizeof(struct old_utsname); + unsigned struct_oldold_utsname_sz = sizeof(struct oldold_utsname); + unsigned struct_itimerspec_sz = sizeof(struct itimerspec); + #endif // SANITIZER_LINUX + + #if SANITIZER_LINUX && !SANITIZER_ANDROID ++ // Use pre-computed size of struct ustat to avoid <sys/ustat.h> which ++ // has been removed from glibc 2.28. ++ #if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \ ++ || defined(__powerpc64__) || defined(__arch64__) || defined(__sparcv9) \ ++ || defined(__x86_64__) ++ #define SIZEOF_STRUCT_USTAT 32 ++ #elif defined(__arm__) || defined(__i386__) || defined(__mips__) \ ++ || defined(__powerpc__) || defined(__s390__) ++ #define SIZEOF_STRUCT_USTAT 20 ++ #else ++ #error Unknown size of struct ustat ++ #endif ++ unsigned struct_ustat_sz = SIZEOF_STRUCT_USTAT; + unsigned struct_rlimit64_sz = sizeof(struct rlimit64); + unsigned struct_timex_sz = sizeof(struct timex); + unsigned struct_msqid_ds_sz = sizeof(struct msqid_ds); |