From e2a11b70ece64624019c17cbbce0d5cd20391438 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 6 Jan 2021 14:09:51 +0100 Subject: Removed Interix support * ACE/ace/config-win32-interix.h: * ACE/include/makeinclude/platform_win32_interix.GNU: Deleted. * ACE/ACE-INSTALL.html: * ACE/ace/SOCK_Dgram.cpp: * ACE/ace/SOCK_Dgram_Bcast.cpp: * ACE/ace/Sock_Connect.cpp: * ACE/ace/os_include/sys/os_types.h: --- ACE/ACE-INSTALL.html | 39 +------ ACE/ace/SOCK_Dgram.cpp | 4 +- ACE/ace/SOCK_Dgram_Bcast.cpp | 4 +- ACE/ace/Sock_Connect.cpp | 4 +- ACE/ace/config-win32-interix.h | 120 --------------------- ACE/ace/os_include/sys/os_types.h | 2 +- ACE/include/makeinclude/platform_win32_interix.GNU | 42 -------- 7 files changed, 8 insertions(+), 207 deletions(-) delete mode 100644 ACE/ace/config-win32-interix.h delete mode 100644 ACE/include/makeinclude/platform_win32_interix.GNU diff --git a/ACE/ACE-INSTALL.html b/ACE/ACE-INSTALL.html index 0b7bb001acb..c905f6a44eb 100644 --- a/ACE/ACE-INSTALL.html +++ b/ACE/ACE-INSTALL.html @@ -211,7 +211,7 @@ document.

Linux on PPC; OpenMVS; Tandem; SCO; FreeBSD; NetBSD; OpenBSD; Macintosh OS X; OS/9; PharLap ETS 13; - QNX RTP and Neutrino 2.0; Interix (Windows Services for Unix) + QNX RTP and Neutrino 2.0 Not maintained @@ -285,7 +285,6 @@ The following sections explain how to build ACE on:

  • Windows (including MinGW and Cygwin)
  • VxWorks
  • Android
    • -
  • Interix
  • RTEMS
    • @@ -1025,42 +1024,6 @@ of the various tests on Cygwin and the different Windows flavors.

    -
    - -

    -

    Building and Installing ACE on Win32 with Interix

    -

    Interix comes with a BSD style make; you need GNU make. -Make builds easily under Interix or there is a prebuilt -package at:

    -

    http://www.interopsystems.com/tools/warehouse.htm

    -

    If you are building for a machine without a network -card, you may want to check here first.

    -

    This port was built and tested under Interix 3.5. a.k.a. -Windows -Services for UNIX 3.5.

    -

    To build follow the Traditional ACE/GNU Make -Configuration instructions replacing the following include directives:

    -

    #include -"ace/config-win32-interix.h"

    -

    for the config.h header

    -

    and:

    -

    include -$(ACE_ROOT)/include/makeinclude/platform_win32_interix.GNU

    -

    for your platform_macros.GNU file.

    -

    ACE should build fine with just 'make', the only other option tried thus far is -'make static_libs_only=1' which also works. Any -other options may not work.

    -

    ACE TESTS

    -

    The tests are located in $ACE_ROOT/tests. After building the library, you can -change to that directory and run make:

    -

    % cd $ACE_ROOT/tests
    % make -

    Once you build all the tests, you can run run_test.pl in the tests directory to try all the tests:

    -

    % run_test.pl

    -

    If you are using ACE as a shared library, you will need -to modify your LD_LIBRARY_PATH as explained inTraditional ACE/GNU Make Configuration.

    -

    -

    Building and Installing ACE on VxWorks

    For the most part, you should be able to follow the instructions above diff --git a/ACE/ace/SOCK_Dgram.cpp b/ACE/ace/SOCK_Dgram.cpp index 4b06480ae2f..f0688344f2f 100644 --- a/ACE/ace/SOCK_Dgram.cpp +++ b/ACE/ace/SOCK_Dgram.cpp @@ -668,7 +668,7 @@ ACE_SOCK_Dgram::make_multicast_ifaddr (ip_mreq *ret_mreq, ip_mreq lmreq; // Scratch copy. if (net_if != 0) { -#if defined (ACE_WIN32) || defined(__INTERIX) +#if defined (ACE_WIN32) // This port number is not necessary, just convenient ACE_INET_Addr interface_addr; if (interface_addr.set (mcast_addr.get_port_number (), net_if) == -1) @@ -748,7 +748,7 @@ ACE_SOCK_Dgram::make_multicast_ifaddr (ip_mreq *ret_mreq, reinterpret_cast (&if_address.ifr_addr); lmreq.imr_interface.s_addr = socket_address->sin_addr.s_addr; } -#endif /* ACE_WIN32 || __INTERIX */ +#endif /* ACE_WIN32 */ } else lmreq.imr_interface.s_addr = INADDR_ANY; diff --git a/ACE/ace/SOCK_Dgram_Bcast.cpp b/ACE/ace/SOCK_Dgram_Bcast.cpp index 1b4cedfa8ad..53fadc3e2c5 100644 --- a/ACE/ace/SOCK_Dgram_Bcast.cpp +++ b/ACE/ace/SOCK_Dgram_Bcast.cpp @@ -124,7 +124,7 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name) ACE_TEXT("ACE_SOCK_Dgram_Bcast::mk_broadcast: setsockopt failed")), -1); -#if !defined (ACE_WIN32) && !defined(__INTERIX) +#if !defined (ACE_WIN32) ACE_HANDLE s = this->get_handle (); char buf[BUFSIZ]; @@ -280,7 +280,7 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name) ACE_Bcast_Node (addr, this->if_list_), -1); -#endif /* !ACE_WIN32 && !__INTERIX */ +#endif /* !ACE_WIN32 */ if (this->if_list_ == 0) { errno = ENXIO; diff --git a/ACE/ace/Sock_Connect.cpp b/ACE/ace/Sock_Connect.cpp index e74b4e501ce..d04c2b577d8 100644 --- a/ACE/ace/Sock_Connect.cpp +++ b/ACE/ace/Sock_Connect.cpp @@ -173,7 +173,7 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr, ACE_UNUSED_ARG (host_addr); ACE_UNUSED_ARG (handle); ACE_NOTSUP_RETURN (-1); -#elif !defined(ACE_WIN32) && !defined(__INTERIX) +#elif !defined(ACE_WIN32) ACE_HANDLE s = handle; if (s == ACE_INVALID_HANDLE) @@ -332,7 +332,7 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr, ACE_UNUSED_ARG (host_name); bcast_addr = (ACE_UINT32 (INADDR_BROADCAST)); return 0; -#endif /* !ACE_WIN32 && !__INTERIX */ +#endif /* !ACE_WIN32 */ } int diff --git a/ACE/ace/config-win32-interix.h b/ACE/ace/config-win32-interix.h deleted file mode 100644 index 0fa6ee1febc..00000000000 --- a/ACE/ace/config-win32-interix.h +++ /dev/null @@ -1,120 +0,0 @@ -// -*- C++ -*- -// The following configuration file is designed to work for Interix -// platforms using GNU g++ (Interix == Microsoft's Services for Unix) - -#ifndef ACE_CONFIG_WIN32_INTERIX_H -#define ACE_CONFIG_WIN32_INTERIX_H - -#include /**/ "ace/pre.h" - -#include "ace/config-g++-common.h" - -#define ACE_HAS_SYS_SIGINFO_H -#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R -#define ACE_HAS_4_4BSD_SENDMSG_RECVMSG -#define ACE_HAS_AUTOMATIC_INIT_FINI -#define ACE_HAS_BROKEN_T_ERROR -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES -#define ACE_HAS_DIRENT -#define ACE_HAS_GETPAGESIZE -#define ACE_HAS_GETRUSAGE -#define ACE_HAS_GETRUSAGE_PROTOTYPE -#define ACE_HAS_GPERF -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT -#define ACE_HAS_ICMP_SUPPORT 1 -#define ACE_HAS_IP_MULTICAST -#define ACE_HAS_MEMCHR -#define ACE_HAS_MKDIR -#define ACE_HAS_MSG -#define ACE_HAS_NEW_NOTHROW -#define ACE_HAS_NEW_NO_H -#define ACE_HAS_NONCONST_SELECT_TIMEVAL -#define ACE_HAS_POLL -#define ACE_HAS_POSIX_NONBLOCK -#define ACE_HAS_POSIX_TIME -#define ACE_HAS_PTHREADS_UNIX98_EXT -#define ACE_HAS_PTHREAD_GETCONCURRENCY -#define ACE_HAS_PTHREAD_SETCONCURRENCY -#define ACE_HAS_PTHREAD_SIGMASK_PROTOTYPE -#define ACE_HAS_P_READ_WRITE -#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS -#define ACE_HAS_REENTRANT_FUNCTIONS -#define ACE_HAS_RTLD_LAZY_V -#define ACE_HAS_SEMUN -#define ACE_HAS_SIGINFO_T -#define ACE_HAS_SIGSUSPEND -#define ACE_HAS_SIGWAIT -#define ACE_HAS_SIG_ATOMIC_T -#define ACE_HAS_SIG_C_FUNC -#define ACE_HAS_SOCKADDR_MSG_NAME -#define ACE_HAS_SOCKLEN_T -#define ACE_HAS_SSIZE_T -#define ACE_HAS_STANDARD_CPP_LIBRARY 1 -#define ACE_HAS_STREAMS -#define ACE_HAS_STRING_CLASS -#define ACE_HAS_STRSIGNAL -#define ACE_HAS_SVR4_DYNAMIC_LINKING -#define ACE_HAS_SVR4_GETTIMEOFDAY -#define ACE_HAS_SVR4_SIGNAL_T -#define ACE_HAS_SYSV_IPC -#define ACE_HAS_SYS_SYSCALL_H -#define ACE_HAS_TERMIOS -#define ACE_HAS_UALARM -#define ACE_HAS_UCONTEXT_T -#define ACE_HAS_VOIDPTR_GETTIMEOFDAY -#define ACE_HAS_NONSTATIC_OBJECT_MANAGER - -#define ACE_LACKS_GETPGID -#define ACE_LACKS_ISCTYPE -#define ACE_LACKS_LOG2 -#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS -#define ACE_LACKS_NET_IF_H -#define ACE_LACKS_PRAGMA_ONCE -#define ACE_LACKS_SETSCHED -#define ACE_LACKS_STRRECVFD -#define ACE_LACKS_SYS_SYSCTL_H -#define ACE_LACKS_TIMESPEC_T -#define ACE_LACKS_WCSTOK -#define ACE_LACKS_WCSTOLL -#define ACE_LACKS_WCSTOULL - -// These are probably not needed with gcc 4.x -#define ACE_LACKS_UNSETENV -#define ACE_LACKS_STRTOLL -#define ACE_LACKS_STRTOULL -#define ACE_LACKS_SETEGID -#define ACE_LACKS_SETEUID - - -#define ACE_PAGE_SIZE 4096 -#define ACE_SIZEOF_LONG_LONG 8 -#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 - -#if defined (ACE_HAS_THREADS) -# define ACE_HAS_MUTEX_TIMEOUTS -# define ACE_HAS_PTHREADS -# define ACE_MT_SAFE 1 -#else -# error "You need to enable threads for this Interix port." -#endif /* ACE_HAS_THREADS */ - -// Turns off the tracing feature. -#if !defined (ACE_NTRACE) -#define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ - -// NOTE: In debugging some of the test apps they would all memory fault in using -// ACE_Errno_Guard. Upon inspection of that code it uses TSS to save ERRNO in -// a TSS pointer. Access to that pointer caused the fault. The work around here -// is to tell ACE we have TSS and use emulation. More investigation is needed to -// determine whether Interix TSS is broken or the correct semantics for usage under -// Interix simply need to be ported. -// To get around the issue ACE_HAS_TSS_EMULATION is defined to use TSS emulation -// however while many test programs that use TSS pass the TSS_Test program fails. -#define ACE_HAS_THREAD_SPECIFIC_STORAGE // We need thread specific storage even though... -#define ACE_HAS_TSS_EMULATION // It would appear to be broken in Interix! - - -#include /**/ "ace/post.h" - -#endif /* ACE_CONFIG_WIN32_INTERIX_H */ diff --git a/ACE/ace/os_include/sys/os_types.h b/ACE/ace/os_include/sys/os_types.h index 94acc1d254a..822c8a93d97 100644 --- a/ACE/ace/os_include/sys/os_types.h +++ b/ACE/ace/os_include/sys/os_types.h @@ -65,7 +65,7 @@ typedef double ACE_timer_t; #if defined (ACE_SIZEOF_LONG) && ACE_SIZEOF_LONG == 8 typedef off_t ACE_LOFF_T; -#elif defined (ACE_HAS_RTEMS) || defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__APPLE__) || defined(__INTERIX) || \ +#elif defined (ACE_HAS_RTEMS) || defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__APPLE__) || \ (defined (ACE_OPENVMS) && defined (_LARGEFILE)) typedef off_t ACE_LOFF_T; #elif defined (AIX) || defined (HPUX) || defined (__QNX__) diff --git a/ACE/include/makeinclude/platform_win32_interix.GNU b/ACE/include/makeinclude/platform_win32_interix.GNU deleted file mode 100644 index 0db049dd066..00000000000 --- a/ACE/include/makeinclude/platform_win32_interix.GNU +++ /dev/null @@ -1,42 +0,0 @@ -# -*- Makefile -*- - -# platform_win32_interix.GNU - -versioned_so ?= 0 - -debug ?= 1 -optimize ?= 1 -threads ?= 1 - -CC = gcc -CXX = g++ - -CPPFLAGS += -D_ALL_SOURCE -DCFLAGS += -g -DLD = $(CXX) -LD = $(CXX) -LIBS += -ldl -OCFLAGS += -O2 -PIC = -AR = ar -ARFLAGS = ruv -RANLIB = ranlib -LN_S = cp - -SOFLAGS += -shared -SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $< -PRELIB = @echo - -ifeq ($(threads),1) - LDFLAGS += -lpthread - CFLAGS += -D_THREAD_SAFE -DACE_HAS_THREADS -endif # threads - -PLATFORM_X11_CPPFLAGS=-I/usr/X11R6/include -PLATFORM_X11_LIBS=-lX11 -PLATFORM_X11_LDFLAGS=-L/usr/X11R6/lib - -# Test for template instantiation, add to SOFLAGS if versioned_so set, -# add -E to LDFLAGS if using GNU ld -# -#include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU -- cgit v1.2.1