From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by sourceware.org (Postfix) with ESMTPS id 211193857C6A for ; Mon, 27 Jul 2020 11:48:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 211193857C6A Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tdevries@suse.de X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 61029AFD7; Mon, 27 Jul 2020 11:48:19 +0000 (UTC) Subject: [committed][gdb/build] Fix typo sys/sockets.h -> sys/socket.h From: Tom de Vries To: Joel Brobecker , Eli Zaretskii Cc: gdb-patches@sourceware.org References: <83a70l20dn.fsf@gnu.org> <83ftaczfvl.fsf@gnu.org> <20200701193026.GE5340@adacore.com> <83zh8ivxwb.fsf@gnu.org> <20200703152552.GM5340@adacore.com> <1659c771-a0ee-880a-b84a-91eab790eea7@suse.de> Autocrypt: addr=tdevries@suse.de; keydata= xsBNBF0ltCcBCADDhsUnMMdEXiHFfqJdXeRvgqSEUxLCy/pHek88ALuFnPTICTwkf4g7uSR7 HvOFUoUyu8oP5mNb4VZHy3Xy8KRZGaQuaOHNhZAT1xaVo6kxjswUi3vYgGJhFMiLuIHdApoc u5f7UbV+egYVxmkvVLSqsVD4pUgHeSoAcIlm3blZ1sDKviJCwaHxDQkVmSsGXImaAU+ViJ5l CwkvyiiIifWD2SoOuFexZyZ7RUddLosgsO0npVUYbl6dEMq2a5ijGF6/rBs1m3nAoIgpXk6P TCKlSWVW6OCneTaKM5C387972qREtiArTakRQIpvDJuiR2soGfdeJ6igGA1FZjU+IsM5ABEB AAHNH1RvbSBkZSBWcmllcyA8dGRldnJpZXNAc3VzZS5kZT7CwKsEEwEIAD4WIQSsnSe5hKbL MK1mGmjuhV2rbOJEoAUCXSW0JwIbAwUJA8JnAAULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAh CRDuhV2rbOJEoBYhBKydJ7mEpsswrWYaaO6FXats4kSgc48H/Ra2lq5p3dHsrlQLqM7N68Fo eRDf3PMevXyMlrCYDGLVncQwMw3O/AkousktXKQ42DPJh65zoXB22yUt8m0g12xkLax98KFJ 5NyUloa6HflLl+wQL/uZjIdNUQaHQLw3HKwRMVi4l0/Jh/TygYG1Dtm8I4o708JS4y8GQxoQ UL0z1OM9hyM3gI2WVTTyprsBHy2EjMOu/2Xpod95pF8f90zBLajy6qXEnxlcsqreMaqmkzKn 3KTZpWRxNAS/IH3FbGQ+3RpWkNGSJpwfEMVCeyK5a1n7yt1podd1ajY5mA1jcaUmGppqx827 8TqyteNe1B/pbiUt2L/WhnTgW1NC1QDOwE0EXSW0JwEIAM99H34Bu4MKM7HDJVt864MXbx7B 1M93wVlpJ7Uq+XDFD0A0hIal028j+h6jA6bhzWto4RUfDl/9mn1StngNVFovvwtfzbamp6+W pKHZm9X5YvlIwCx131kTxCNDcF+/adRW4n8CU3pZWYmNVqhMUiPLxElA6QhXTtVBh1RkjCZQ Kmbd1szvcOfaD8s+tJABJzNZsmO2hVuFwkDrRN8Jgrh92a+yHQPd9+RybW2l7sJv26nkUH5Z 5s84P6894ebgimcprJdAkjJTgprl1nhgvptU5M9Uv85Pferoh2groQEAtRPlCGrZ2/2qVNe9 XJfSYbiyedvApWcJs5DOByTaKkcAEQEAAcLAkwQYAQgAJhYhBKydJ7mEpsswrWYaaO6FXats 4kSgBQJdJbQnAhsMBQkDwmcAACEJEO6FXats4kSgFiEErJ0nuYSmyzCtZhpo7oVdq2ziRKD3 twf7BAQBZ8TqR812zKAD7biOnWIJ0McV72PFBxmLIHp24UVe0ZogtYMxSWKLg3csh0yLVwc7 H3vldzJ9AoK3Qxp0Q6K/rDOeUy3HMqewQGcqrsRRh0NXDIQk5CgSrZslPe47qIbe3O7ik/MC q31FNIAQJPmKXX25B115MMzkSKlv4udfx7KdyxHrTSkwWZArLQiEZj5KG4cCKhIoMygPTA3U yGaIvI/BGOtHZ7bEBVUCFDFfOWJ26IOCoPnSVUvKPEOH9dv+sNy7jyBsP5QxeTqwxC/1ZtNS DUCSFQjqA6bEGwM22dP8OUY6SC94x1G81A9/xbtm9LQxKm0EiDH8KBMLfQ== Message-ID: <06b2ef8b-9e00-5e61-1472-7fec02abcc1c@suse.de> Date: Mon, 27 Jul 2020 13:48:08 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <1659c771-a0ee-880a-b84a-91eab790eea7@suse.de> Content-Type: multipart/mixed; boundary="------------67739D263D6AA3A438305D4E" Content-Language: en-US X-Spam-Status: No, score=-11.0 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Jul 2020 11:48:13 -0000 This is a multi-part message in MIME format. --------------67739D263D6AA3A438305D4E Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit [ was: Re: Building today's snapshot of GDB with MinGW ] On 7/27/20 12:26 PM, Tom de Vries wrote: > On 7/27/20 12:05 PM, Tom de Vries wrote: >> On 7/27/20 11:49 AM, Tom de Vries wrote: >>> On 7/3/20 5:25 PM, Joel Brobecker wrote: >>>>> I can submit a change, but it would be difficult for me to try it, and >>>>> regenerate configure in general (I don't have the right version of >>>>> Autotools installed). Would it be okay to send a change and ask >>>>> someone to do the rest? >>>> >>>> No problem; if you send me the configure.xxx change, I can re-run >>>> autoconf et al, and send you a diff with the regenerated files. >>>> We can do that as a private exchange to avoid bothering everyone >>>> else for that part. >>>> >>> >>> Hi, >>> >>> [ I suppose this is the last message related to commit 05a6b8c28b "Don't >>> unnecessarily redefine 'socklen_t' type in MinGW builds.". ] >>> >>> I ran into a build breaker related to this commit: >>> ... >>> src/gdb/ser-tcp.c:65:13: error: conflicting declaration ‘typedef int >>> socklen_t’ >>> 65 | typedef int socklen_t; >>> | ^~~~~~~~~ >>> In file included from ../gnulib/import/unistd.h:40, >>> from >>> /home/vries/gdb_versions/devel/src/gdb/../gnulib/import/pathmax.h:42, >>> from >>> /home/vries/gdb_versions/devel/src/gdb/../gdbsupport/common-defs.h:120, >>> from /home/vries/gdb_versions/devel/src/gdb/defs.h:28, >>> from /home/vries/gdb_versions/devel/src/gdb/ser-tcp.c:20: >>> /usr/include/unistd.h:277:21: note: previous declaration as ‘typedef >>> __socklen_t socklen_t’ >>> 277 | typedef __socklen_t socklen_t; >>> | ^~~~~~~~~ >>> ... >>> >> >> Hmm, this looks fishy: >> ... >> /* Define to 1 if you have the header file. */ >> >> #undef HAVE_SYS_SOCKETS_H >> >> >> >> /* Define to 1 if you have the header file. */ >> >> #undef HAVE_SYS_SOCKET_H >> ... >> >> Anyway, in configure.ac, the check for HAVE_SYS_SOCKET_H comes before >> the check for HAVE_SOCKLEN_T, but in configure, that order is reversed, >> which is the root cause for the breakage. >> >> It looks like AC_CHECK_HEADERS accumulated checks for different header >> files, and that that caused the order reversal. >> > > Scrap that. > > It's a typo : sys/sockets.h instead of sys/socket.h. Fixed in patch below, committed. Thanks, - Tom --------------67739D263D6AA3A438305D4E Content-Type: text/x-patch; charset=UTF-8; name="0001-gdb-build-Fix-typo-sys-sockets.h-sys-socket.h.patch" Content-Transfer-Encoding: 8bit Content-Disposition: inline; filename="0001-gdb-build-Fix-typo-sys-sockets.h-sys-socket.h.patch" [gdb/build] Fix typo sys/sockets.h -> sys/socket.h I'm running into a build breaker: ... src/gdb/ser-tcp.c:65:13: error: conflicting declaration ‘typedef int socklen_t’ 65 | typedef int socklen_t; | ^~~~~~~~~ In file included from ../gnulib/import/unistd.h:40, from /home/vries/gdb_versions/devel/src/gdb/../gnulib/import/pathmax.h:42, from /home/vries/gdb_versions/devel/src/gdb/../gdbsupport/common-defs.h:120, from src/gdb/defs.h:28, from src/gdb/ser-tcp.c:20: /usr/include/unistd.h:277:21: note: previous declaration as ‘typedef __socklen_t socklen_t’ 277 | typedef __socklen_t socklen_t; | ^~~~~~~~~ ... after commit 05a6b8c28b "Don't unnecessarily redefine 'socklen_t' type in MinGW builds". The root cause is a typo in gdb/configure.ac, using sys/sockets.h where sys/socket.h was meant: ... AC_CHECK_HEADERS([sys/sockets.h]) ... Fix the typo. Build and tested on x86_64-linux. gdb/ChangeLog: 2020-07-27 Tom de Vries * configure.ac: Fix sys/sockets.h -> sys/socket.h typo. * config.in: Regenerate. * configure: Regenerate. --- gdb/config.in | 3 --- gdb/configure | 8 ++++---- gdb/configure.ac | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/gdb/config.in b/gdb/config.in index 26053475db..1aeb8603a1 100644 --- a/gdb/config.in +++ b/gdb/config.in @@ -505,9 +505,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_SELECT_H -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_SOCKETS_H - /* Define to 1 if you have the header file. */ #undef HAVE_SYS_SOCKET_H diff --git a/gdb/configure b/gdb/configure index c9a4b42ea1..adcfa49c63 100755 --- a/gdb/configure +++ b/gdb/configure @@ -11844,12 +11844,12 @@ fi done -for ac_header in sys/sockets.h +for ac_header in sys/socket.h do : - ac_fn_c_check_header_mongrel "$LINENO" "sys/sockets.h" "ac_cv_header_sys_sockets_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_sockets_h" = xyes; then : + ac_fn_c_check_header_mongrel "$LINENO" "sys/socket.h" "ac_cv_header_sys_socket_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_socket_h" = xyes; then : cat >>confdefs.h <<_ACEOF -#define HAVE_SYS_SOCKETS_H 1 +#define HAVE_SYS_SOCKET_H 1 _ACEOF fi diff --git a/gdb/configure.ac b/gdb/configure.ac index 3bec21560e..620ae23e34 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -1248,7 +1248,7 @@ AC_CHECK_HEADERS(term.h, [], [], #endif ]) -AC_CHECK_HEADERS([sys/sockets.h]) +AC_CHECK_HEADERS([sys/socket.h]) AC_CHECK_HEADERS([ws2tcpip.h]) # ------------------------- # --------------67739D263D6AA3A438305D4E--