external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

Revert 7a6980a3, restoring build on Alpine Linux

Browse source 
This reverts an OpenSUSE patch ("libast/comp/conf.sh: apply limits
detection fixes for Linux"). It broke the build on Alpine Linux
with the musl C library (see also e245856f).
This commit is contained in:
Martijn Dekker 2021-02-03 21:42:50 +00:00
parent 9ddb45b12d
commit 7dbcbce407
1 changed files with 4 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/lib/libast/comp/conf.sh
View file

@ -144,7 +144,7 @@ main()
return 1; return 1;
#else #else
_ast_intmax_t s = 0x7fffffffffffffffLL; _ast_intmax_t s = 0x7fffffffffffffffLL;
unsigned _ast_intmax_t u = 0xffffffffffffffffULL; unsigned _ast_intmax_t u = 0xffffffffffffffffLL;
return 0; return 0;
#endif #endif
@ -817,11 +817,7 @@ defined() # list-file
cat <<! cat <<!
${head} ${head}
#include <sys/types.h> #include <sys/types.h>
#include <sys/uio.h>
#include <limits.h> #include <limits.h>
#if defined(__linux__)
#include <linux/limits.h>
#endif
#include <unistd.h>$systeminfo$headers #include <unistd.h>$systeminfo$headers
${tail} ${tail}
#undef conf #undef conf
@ -849,11 +845,7 @@ unsigned int conf[] = {
cat <<! cat <<!
${head} ${head}
#include <sys/types.h> #include <sys/types.h>
#include <sys/uio.h>
#include <limits.h> #include <limits.h>
#if defined(__linux__)
#include <linux/limits.h>
#endif
#include <unistd.h>$systeminfo$headers #include <unistd.h>$systeminfo$headers
${tail} ${tail}
#undef conf #undef conf
@ -894,11 +886,7 @@ done
cat <<! cat <<!
${head} ${head}
#include <sys/types.h> #include <sys/types.h>
#include <sys/uio.h>
#include <limits.h> #include <limits.h>
#if defined(__linux__)
#include <linux/limits.h>
#endif
#include <unistd.h>$systeminfo$headers #include <unistd.h>$systeminfo$headers
${tail} ${tail}
#undef conf #undef conf
@ -1076,7 +1064,7 @@ do eval name=\"'$'CONF_name_$key\"
case $flags in case $flags in
*[Ll]*) d= *[Ll]*) d=
case ${conf_name} in case ${conf_name} in
LONG_MAX|UINT_MAX|INT_MAX|SHRT_MAX|SSIZE_MAX|WORD_BIT|LONG_BIT|PTHREAD_*) LONG_MAX|SSIZE_MAX)
x= x=
;; ;;
*) eval x='$'CONF_const_${conf_name} *) eval x='$'CONF_const_${conf_name}
@ -1136,11 +1124,7 @@ do eval name=\"'$'CONF_name_$key\"
${head} ${head}
#include <stdio.h> #include <stdio.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/uio.h>
#include <limits.h> #include <limits.h>
#if defined(__linux__)
#include <linux/limits.h>
#endif
#include <unistd.h>$systeminfo$headers #include <unistd.h>$systeminfo$headers
${tail} ${tail}
int int
@ -1155,11 +1139,7 @@ main()
${head} ${head}
#include <stdio.h> #include <stdio.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/uio.h>
#include <limits.h> #include <limits.h>
#if defined(__linux__)
#include <linux/limits.h>
#endif
#include <unistd.h>$systeminfo$headers #include <unistd.h>$systeminfo$headers
${tail} ${tail}
${script} ${script}
@ -1306,11 +1286,7 @@ printf("#endif\n");
*) cat > $tmp.c <<! *) cat > $tmp.c <<!
${head} ${head}
#include <sys/types.h> #include <sys/types.h>
#include <sys/uio.h>
#include <limits.h> #include <limits.h>
#if defined(__linux__)
#include <linux/limits.h>
#endif
#include <unistd.h>$systeminfo$headers #include <unistd.h>$systeminfo$headers
${tail} ${tail}
${script} ${script}
@ -1389,7 +1365,7 @@ ${script}
*[lLuU]) *[lLuU])
case $LL_suffix in case $LL_suffix in
??) case $conf_limit in ??) case $conf_limit in
*[0-9a-fA-F][lL]|*[0-9a-fA-F][uU][lL]) *[!lL][lL]|*[!lL][lL][uU])
conf_limit=${conf_limit}L conf_limit=${conf_limit}L
;; ;;
esac esac
@ -1424,7 +1400,7 @@ ${script}
*[lLuU]) *[lLuU])
case $LL_suffix in case $LL_suffix in
??) case $conf_minmax in ??) case $conf_minmax in
*[0-9a-fA-F][lL]|*[0-9a-fA-F][uU][lL]) *[!lL][lL]|*[!lL][lL][uU])
conf_minmax=${conf_minmax}L conf_minmax=${conf_minmax}L
;; ;;
esac esac
@ -1601,11 +1577,7 @@ esac
cat <<! cat <<!
${head} ${head}
#include <sys/types.h> #include <sys/types.h>
#include <sys/uio.h>
#include <limits.h> #include <limits.h>
#if defined(__linux__)
#include <linux/limits.h>
#endif
#include <unistd.h>$systeminfo$headers #include <unistd.h>$systeminfo$headers
${tail} ${tail}
#include "${base}.h" #include "${base}.h"