bcollet/socat
1
0
Fork 0
mirror of https://repo.or.cz/socat.git synced 2024-12-22 23:42:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert gcc check to reenable cross compiling

Browse source
This commit is contained in:
Gerhard Rieger 2014-11-23 17:27:21 +01:00
parent 522bb45479
commit 6f6d7ccb86
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CHANGES
View file

@ -61,7 +61,7 @@ corrections:
Test: IGNOREEOF_REV Test: IGNOREEOF_REV
Thanks to Franz Fasching for reporting this bug. Thanks to Franz Fasching for reporting this bug.
Address SYSTEM, when terminating, shutted down its parent addresses, Address SYSTEM, when terminating, shut down its parent addresses,
e.g. an SSL connection which the parent assumed to still be active. e.g. an SSL connection which the parent assumed to still be active.
Test: SYSTEM_SHUTDOWN Test: SYSTEM_SHUTDOWN
@ -93,6 +93,10 @@ porting:
Socat included <sys/poll.h> instead of POSIX <poll.h> Socat included <sys/poll.h> instead of POSIX <poll.h>
Thanks to John Spencer for reporting this issue. Thanks to John Spencer for reporting this issue.
Version 1.7.2.4 changed the check for gcc in configure.ac; this
broke cross compiling. The particular check gets reverted.
Thanks to Ross Burton and Danomi Manchego for reporting this issue.
testing: testing:
Do not distribute testcert.conf with socat source but generate it Do not distribute testcert.conf with socat source but generate it
(and new testcert6.conf) during test.sh run. (and new testcert6.conf) during test.sh run.

2
configure.in
View file

@ -41,7 +41,7 @@ AC_CHECK_PROG(AR, ar, ar, gar)
# fail # fail
AC_LANG_COMPILER_REQUIRE() AC_LANG_COMPILER_REQUIRE()
if test "$CC" = "gcc"; then if test "$GCC" = yes; then
CFLAGS="$CFLAGS -D_GNU_SOURCE -Wall -Wno-parentheses" CFLAGS="$CFLAGS -D_GNU_SOURCE -Wall -Wno-parentheses"
ERRONWARN="-Werror -O0" ERRONWARN="-Werror -O0"
elif test "$CC" = "clang"; then elif test "$CC" = "clang"; then

4
test.sh
View file

@ -179,8 +179,8 @@ case "$UNAME" in
*) *)
PTYOPTS="echo=0,opost=0" PTYOPTS="echo=0,opost=0"
#PTYOPTS2="raw,echo=0" #PTYOPTS2="raw,echo=0"
#PTYOPTS2="cfmakeraw" PTYOPTS2="cfmakeraw"
PTYOPTS2="rawer" #PTYOPTS2="rawer"
;; ;;
esac esac