hollalinux
/
slackbuilds
mirror of https://github.com/SlackBuildsOrg/slackbuilds.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

development/gcclegacy494: Patched to build with glibc-2.28. 

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
This commit is contained in:
khronosschoty 2018-11-02 13:33:37 +00:00 committed by Willy Sudiarto Raharjo
parent 8fbf713f4f
commit d17bbffe86
No known key found for this signature in database
GPG Key ID: 887B8374D7333381
2 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
development/gcclegacy494/gcclegacy494.SlackBuild
View File

@ -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

47
development/gcclegacy494/ustat.h.patch Normal file
View File

@ -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);