drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
acadia-newlib/winsup/acinclude.m4

29 lines
923 B
Plaintext
Raw Normal View History

ChangeLog: 2012-11-12 Christopher Faylor <me.cygwin2012@cgf.cx> * Makefile.common: Revamp for new configury. Add default compilation targets, include .E processing. Add magic for allowing "CFLAGS" to control optimization options in "CXXFLAGS". * configure.cygwin: New include for Cygwin configure.in's. * acinclude.m4: Delete old definitions. Implement AC_WINDOWS_HEADERS, AC_WINDOWS_LIBS, AC_CYGWIN_INCLUDES, target_builddir, winsup_srcdir. * aclocal.m4: Regenerate. * autogen.sh: New file. * ccwrap: New script. * c++wrap: New script. * config.guess: New script. * config.sub: New script. * configure: Regenerate. * configure.in: Eliminate LIB_AC_PROG_* calls in favor of standard. Delete ancient target test. * install-sh: New script. cygserver/ChangeLog: 2012-11-12 Christopher Faylor <me.cygwin2012@cgf.cx> * Makefile.in: Revamp for new configury. * configure.in: Revamp for new configury. * aclocal.m4: Regenerate. * configure: Ditto. * autogen.sh: New script. cygwin/ChangeLog: 2012-11-22 Christopher Faylor <me.cygwin2012@cgf.cx> * select.cc (select): Don't return -1 when we've timed out after looping. 2012-11-22 Christopher Faylor <me.cygwin2012@cgf.cx> * Makefile.in: Revamp for new configury. (datarootdir): Add variable setting. (winver_stamp): Accommodate changes to mkvers.sh setting. (libc.a): Fix race when libm.a might not have been built yet. * configure.in: Revamp for new configury. * aclocal.m4: Regenerate. * configure: Ditto. * autogen.sh: New script. * mkvers.sh: Find include directives via CFLAGS and friends rather than assuming that w32api lives nearby. utils/ChangeLog: 2012-11-12 Christopher Faylor <me.cygwin2012@cgf.cx> * aclocal.m4: Regenerate. * configure: Ditto. * autogen.sh: New script. * configure.in: Revamp for new configury. * Makefile.in: Revamp for new configury. Rename ALL_* to just *. Always use "VERBOSE" setting. (MINGW_CXX): Don't include CFLAGS in definition. (all): Define target first, before everything else so that it is the default. (ps.exe): Don't add useless -lcygwin. (ldh.exe): For consistency, add to existing MINGW_LDFLAGS rather than redefining them. (cygcheck.exe): Always include -lz for MINGW_LDFLAGS. Don't try to figure out where to find it. (dumper.exe): Simplify check. Assume libraries are installed rather than trying to retrieve from source tree. (install): Just use /bin/mkdir to create directories. (Makefile): Regenerate when standard dependencies change. * dump_setup.cc: Always include zlib.h. Remove accommodations for it possibly not existing. * parse_pe.cc: Add define which allows building with installed binutils package. * dumper.cc: Ditto.
2012-11-23 05:22:47 -08:00
dnl This provides configure definitions used by all the cygwin
update to newer autoconf
2006-05-24 09:59:03 -07:00
dnl configure.in files.
ChangeLog: 2012-11-12 Christopher Faylor <me.cygwin2012@cgf.cx> * Makefile.common: Revamp for new configury. Add default compilation targets, include .E processing. Add magic for allowing "CFLAGS" to control optimization options in "CXXFLAGS". * configure.cygwin: New include for Cygwin configure.in's. * acinclude.m4: Delete old definitions. Implement AC_WINDOWS_HEADERS, AC_WINDOWS_LIBS, AC_CYGWIN_INCLUDES, target_builddir, winsup_srcdir. * aclocal.m4: Regenerate. * autogen.sh: New file. * ccwrap: New script. * c++wrap: New script. * config.guess: New script. * config.sub: New script. * configure: Regenerate. * configure.in: Eliminate LIB_AC_PROG_* calls in favor of standard. Delete ancient target test. * install-sh: New script. cygserver/ChangeLog: 2012-11-12 Christopher Faylor <me.cygwin2012@cgf.cx> * Makefile.in: Revamp for new configury. * configure.in: Revamp for new configury. * aclocal.m4: Regenerate. * configure: Ditto. * autogen.sh: New script. cygwin/ChangeLog: 2012-11-22 Christopher Faylor <me.cygwin2012@cgf.cx> * select.cc (select): Don't return -1 when we've timed out after looping. 2012-11-22 Christopher Faylor <me.cygwin2012@cgf.cx> * Makefile.in: Revamp for new configury. (datarootdir): Add variable setting. (winver_stamp): Accommodate changes to mkvers.sh setting. (libc.a): Fix race when libm.a might not have been built yet. * configure.in: Revamp for new configury. * aclocal.m4: Regenerate. * configure: Ditto. * autogen.sh: New script. * mkvers.sh: Find include directives via CFLAGS and friends rather than assuming that w32api lives nearby. utils/ChangeLog: 2012-11-12 Christopher Faylor <me.cygwin2012@cgf.cx> * aclocal.m4: Regenerate. * configure: Ditto. * autogen.sh: New script. * configure.in: Revamp for new configury. * Makefile.in: Revamp for new configury. Rename ALL_* to just *. Always use "VERBOSE" setting. (MINGW_CXX): Don't include CFLAGS in definition. (all): Define target first, before everything else so that it is the default. (ps.exe): Don't add useless -lcygwin. (ldh.exe): For consistency, add to existing MINGW_LDFLAGS rather than redefining them. (cygcheck.exe): Always include -lz for MINGW_LDFLAGS. Don't try to figure out where to find it. (dumper.exe): Simplify check. Assume libraries are installed rather than trying to retrieve from source tree. (install): Just use /bin/mkdir to create directories. (Makefile): Regenerate when standard dependencies change. * dump_setup.cc: Always include zlib.h. Remove accommodations for it possibly not existing. * parse_pe.cc: Add define which allows building with installed binutils package. * dumper.cc: Ditto.
2012-11-23 05:22:47 -08:00
AC_DEFUN([AC_CYGWIN_INCLUDES], [
: ${ac_cv_prog_CXX:=$CXX}
: ${ac_cv_prog_CC:=$CC}
cygwin_headers=$(realdirpath "$winsup_srcdir/cygwin/include")
if test -z "$cygwin_headers"; then
AC_MSG_ERROR([cannot find $winsup_srcdir/cygwin/include directory])
fi
newlib_headers=$(realdirpath $winsup_srcdir/../newlib/libc/include)
if test -z "$newlib_headers"; then
AC_MSG_ERROR([cannot find newlib source directory: $winsup_srcdir/../newlib/libc/include])
update to newer autoconf
2006-05-24 09:59:03 -07:00
fi
ChangeLog: 2012-11-12 Christopher Faylor <me.cygwin2012@cgf.cx> * Makefile.common: Revamp for new configury. Add default compilation targets, include .E processing. Add magic for allowing "CFLAGS" to control optimization options in "CXXFLAGS". * configure.cygwin: New include for Cygwin configure.in's. * acinclude.m4: Delete old definitions. Implement AC_WINDOWS_HEADERS, AC_WINDOWS_LIBS, AC_CYGWIN_INCLUDES, target_builddir, winsup_srcdir. * aclocal.m4: Regenerate. * autogen.sh: New file. * ccwrap: New script. * c++wrap: New script. * config.guess: New script. * config.sub: New script. * configure: Regenerate. * configure.in: Eliminate LIB_AC_PROG_* calls in favor of standard. Delete ancient target test. * install-sh: New script. cygserver/ChangeLog: 2012-11-12 Christopher Faylor <me.cygwin2012@cgf.cx> * Makefile.in: Revamp for new configury. * configure.in: Revamp for new configury. * aclocal.m4: Regenerate. * configure: Ditto. * autogen.sh: New script. cygwin/ChangeLog: 2012-11-22 Christopher Faylor <me.cygwin2012@cgf.cx> * select.cc (select): Don't return -1 when we've timed out after looping. 2012-11-22 Christopher Faylor <me.cygwin2012@cgf.cx> * Makefile.in: Revamp for new configury. (datarootdir): Add variable setting. (winver_stamp): Accommodate changes to mkvers.sh setting. (libc.a): Fix race when libm.a might not have been built yet. * configure.in: Revamp for new configury. * aclocal.m4: Regenerate. * configure: Ditto. * autogen.sh: New script. * mkvers.sh: Find include directives via CFLAGS and friends rather than assuming that w32api lives nearby. utils/ChangeLog: 2012-11-12 Christopher Faylor <me.cygwin2012@cgf.cx> * aclocal.m4: Regenerate. * configure: Ditto. * autogen.sh: New script. * configure.in: Revamp for new configury. * Makefile.in: Revamp for new configury. Rename ALL_* to just *. Always use "VERBOSE" setting. (MINGW_CXX): Don't include CFLAGS in definition. (all): Define target first, before everything else so that it is the default. (ps.exe): Don't add useless -lcygwin. (ldh.exe): For consistency, add to existing MINGW_LDFLAGS rather than redefining them. (cygcheck.exe): Always include -lz for MINGW_LDFLAGS. Don't try to figure out where to find it. (dumper.exe): Simplify check. Assume libraries are installed rather than trying to retrieve from source tree. (install): Just use /bin/mkdir to create directories. (Makefile): Regenerate when standard dependencies change. * dump_setup.cc: Always include zlib.h. Remove accommodations for it possibly not existing. * parse_pe.cc: Add define which allows building with installed binutils package. * dumper.cc: Ditto.
2012-11-23 05:22:47 -08:00
newlib_headers="$target_builddir/newlib/targ-include $newlib_headers"
update to newer autoconf
2006-05-24 09:59:03 -07:00
winsup: disable fortify source When using a compiler that automatically enables -D_FORTIFY_SOURCE, building winsup fails with errors like below. Since winsup is not setup to compile itself with _FORTIFY_SOURCE, disable it for now. make[4]: Entering directory '.../x86_64-pc-cygwin/winsup/cygwin' CC libc/minires-os-if.o In file included from .../newlib/newlib/libc/include/ssp/strings.h:34, from .../newlib/newlib/libc/include/strings.h:77, from .../newlib/newlib/libc/include/string.h:24, from ../../../../../winsup/cygwin/string.h:12, from /usr/x86_64-pc-cygwin/usr/include/w32api/guiddef.h:154, from /usr/x86_64-pc-cygwin/usr/include/w32api/winnt.h:635, from /usr/x86_64-pc-cygwin/usr/include/w32api/minwindef.h:163, from /usr/x86_64-pc-cygwin/usr/include/w32api/windef.h:9, from /usr/x86_64-pc-cygwin/usr/include/windows.h:69, from ../../../../../winsup/cygwin/winlean.h:56, from ../../../../../winsup/cygwin/winsup.h:84, from ../../../../../winsup/cygwin/libc/minires-os-if.c:13: .../newlib/winsup/cygwin/include/ssp/socket.h:9:1: error: conflicting types for 'recv'; have 'ssize_t(int, void *, size_t, int)' {aka 'long int(int, void *, long unsigned int, int)'} 9 | __ssp_redirect0(ssize_t, recv, \ | ^~~~~~~~~~~~~~~ In file included from /usr/x86_64-pc-cygwin/usr/include/w32api/ws2tcpip.h:17, from ../../../../../winsup/cygwin/libc/minires-os-if.c:14: /usr/x86_64-pc-cygwin/usr/include/w32api/winsock2.h:1022:34: note: previous declaration of 'recv' with type 'int(SOCKET, char *, int, int)' {aka 'int(long long unsigned int, char *, int, int)'} 1022 | WINSOCK_API_LINKAGE int WSAAPI recv(SOCKET s,char *buf,int len,int flags); | ^~~~ In file included from .../newlib/newlib/libc/include/ssp/strings.h:34, from .../newlib/newlib/libc/include/strings.h:77, from .../newlib/newlib/libc/include/string.h:24, from ../../../../../winsup/cygwin/string.h:12, from /usr/x86_64-pc-cygwin/usr/include/w32api/guiddef.h:154, from /usr/x86_64-pc-cygwin/usr/include/w32api/winnt.h:635, from /usr/x86_64-pc-cygwin/usr/include/w32api/minwindef.h:163, from /usr/x86_64-pc-cygwin/usr/include/w32api/windef.h:9, from /usr/x86_64-pc-cygwin/usr/include/windows.h:69, from ../../../../../winsup/cygwin/winlean.h:56, from ../../../../../winsup/cygwin/winsup.h:84, from ../../../../../winsup/cygwin/libc/minires-os-if.c:13: .../newlib/winsup/cygwin/include/ssp/socket.h:13:1: error: conflicting types for 'recvfrom'; have 'ssize_t(int, void *, size_t, int, struct sockaddr *, socklen_t *)' {aka 'long int(int, void *, long unsigned int, int, struct sockaddr *, int *)'} 13 | __ssp_redirect0(ssize_t, recvfrom, \ | ^~~~~~~~~~~~~~~ In file included from /usr/x86_64-pc-cygwin/usr/include/w32api/ws2tcpip.h:17, from ../../../../../winsup/cygwin/libc/minires-os-if.c:14: /usr/x86_64-pc-cygwin/usr/include/w32api/winsock2.h:1023:34: note: previous declaration of 'recvfrom' with type 'int(SOCKET, char *, int, int, struct sockaddr *, int *)' {aka 'int(long long unsigned int, char *, int, int, struct sockaddr *, int *)'} 1023 | WINSOCK_API_LINKAGE int WSAAPI recvfrom(SOCKET s,char *buf,int len,int flags,struct sockaddr *from,int *fromlen); | ^~~~~~~~ make[4]: *** [Makefile:1930: libc/minires-os-if.o] Error 1 CC gmon.o ../../../../../winsup/cygwin/gmon.c:60: error: "bzero" redefined [-Werror] 60 | #define bzero(ptr,size) memset (ptr, 0, size); | In file included from .../newlib/newlib/libc/include/strings.h:77, from .../newlib/newlib/libc/include/string.h:24, from ../../../../../winsup/cygwin/string.h:12, from /usr/x86_64-pc-cygwin/usr/include/w32api/guiddef.h:154, from /usr/x86_64-pc-cygwin/usr/include/w32api/winnt.h:635, from /usr/x86_64-pc-cygwin/usr/include/w32api/minwindef.h:163, from /usr/x86_64-pc-cygwin/usr/include/w32api/windef.h:9, from /usr/x86_64-pc-cygwin/usr/include/windows.h:69, from ../../../../../winsup/cygwin/winlean.h:56, from ../../../../../winsup/cygwin/winsup.h:84, from ../../../../../winsup/cygwin/gmon.h:69, from ../../../../../winsup/cygwin/gmon.c:47: .../newlib/newlib/libc/include/ssp/strings.h:43: note: this is the location of the previous definition 43 | #define bzero(dst, len) \ | cc1: all warnings being treated as errors
2022-03-14 20:17:44 -07:00
AM_CPPFLAGS="-U_FORTIFY_SOURCE -I${winsup_srcdir}/cygwin -I${target_builddir}/winsup/cygwin"
Cygwin: automake: change @INCLUDES@ to @AM_CPPFLAGS@ to avoid warnings Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
2021-04-29 02:23:11 -07:00
AM_CPPFLAGS="${AM_CPPFLAGS} -isystem ${cygwin_headers}"
Cygwin: Remove ccwrap ccwrap massages the compiler's standard include directories to remove '/usr/include/w32api', with the intent of allowing it to be overriden by '--with-windows-headers' (See 4c36016b). I'm not 100% convinced that this is always working as desired, since in some places w32api includes are done using <w32api/something.h>, which will find them via the path /usr/include. If this does turn out to be needed, this could also be implemented by constructing the appropriate compiler flags once, rather than on every compiler invocation.
2020-10-03 06:41:58 -07:00
for h in ${newlib_headers}; do
Cygwin: automake: change @INCLUDES@ to @AM_CPPFLAGS@ to avoid warnings Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
2021-04-29 02:23:11 -07:00
AM_CPPFLAGS="${AM_CPPFLAGS} -isystem $h"
Cygwin: Remove ccwrap ccwrap massages the compiler's standard include directories to remove '/usr/include/w32api', with the intent of allowing it to be overriden by '--with-windows-headers' (See 4c36016b). I'm not 100% convinced that this is always working as desired, since in some places w32api includes are done using <w32api/something.h>, which will find them via the path /usr/include. If this does turn out to be needed, this could also be implemented by constructing the appropriate compiler flags once, rather than on every compiler invocation.
2020-10-03 06:41:58 -07:00
done
Cygwin: automake: change @INCLUDES@ to @AM_CPPFLAGS@ to avoid warnings Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
2021-04-29 02:23:11 -07:00
AC_SUBST(AM_CPPFLAGS)
update to newer autoconf
2006-05-24 09:59:03 -07:00
])
ChangeLog: 2012-11-12 Christopher Faylor <me.cygwin2012@cgf.cx> * Makefile.common: Revamp for new configury. Add default compilation targets, include .E processing. Add magic for allowing "CFLAGS" to control optimization options in "CXXFLAGS". * configure.cygwin: New include for Cygwin configure.in's. * acinclude.m4: Delete old definitions. Implement AC_WINDOWS_HEADERS, AC_WINDOWS_LIBS, AC_CYGWIN_INCLUDES, target_builddir, winsup_srcdir. * aclocal.m4: Regenerate. * autogen.sh: New file. * ccwrap: New script. * c++wrap: New script. * config.guess: New script. * config.sub: New script. * configure: Regenerate. * configure.in: Eliminate LIB_AC_PROG_* calls in favor of standard. Delete ancient target test. * install-sh: New script. cygserver/ChangeLog: 2012-11-12 Christopher Faylor <me.cygwin2012@cgf.cx> * Makefile.in: Revamp for new configury. * configure.in: Revamp for new configury. * aclocal.m4: Regenerate. * configure: Ditto. * autogen.sh: New script. cygwin/ChangeLog: 2012-11-22 Christopher Faylor <me.cygwin2012@cgf.cx> * select.cc (select): Don't return -1 when we've timed out after looping. 2012-11-22 Christopher Faylor <me.cygwin2012@cgf.cx> * Makefile.in: Revamp for new configury. (datarootdir): Add variable setting. (winver_stamp): Accommodate changes to mkvers.sh setting. (libc.a): Fix race when libm.a might not have been built yet. * configure.in: Revamp for new configury. * aclocal.m4: Regenerate. * configure: Ditto. * autogen.sh: New script. * mkvers.sh: Find include directives via CFLAGS and friends rather than assuming that w32api lives nearby. utils/ChangeLog: 2012-11-12 Christopher Faylor <me.cygwin2012@cgf.cx> * aclocal.m4: Regenerate. * configure: Ditto. * autogen.sh: New script. * configure.in: Revamp for new configury. * Makefile.in: Revamp for new configury. Rename ALL_* to just *. Always use "VERBOSE" setting. (MINGW_CXX): Don't include CFLAGS in definition. (all): Define target first, before everything else so that it is the default. (ps.exe): Don't add useless -lcygwin. (ldh.exe): For consistency, add to existing MINGW_LDFLAGS rather than redefining them. (cygcheck.exe): Always include -lz for MINGW_LDFLAGS. Don't try to figure out where to find it. (dumper.exe): Simplify check. Assume libraries are installed rather than trying to retrieve from source tree. (install): Just use /bin/mkdir to create directories. (Makefile): Regenerate when standard dependencies change. * dump_setup.cc: Always include zlib.h. Remove accommodations for it possibly not existing. * parse_pe.cc: Add define which allows building with installed binutils package. * dumper.cc: Ditto.
2012-11-23 05:22:47 -08:00
AC_SUBST(target_builddir)
AC_SUBST(winsup_srcdir)