From 82b2a0be6eb7aed62523b274b1d9c632664e3cc2 Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Thu, 13 May 2004 22:34:02 +0000 Subject: [PATCH] win32-x86-cygwin => cygwin-x86 --- configure/os/CONFIG.Common.cygwin-x86 | 34 +++++++++++++++++++ ...cygwin.Common => CONFIG.cygwin-x86.Common} | 6 ++-- ...86-cygwin => CONFIG.cygwin-x86.cygwin-x86} | 6 ++-- configure/os/CONFIG_COMPAT | 2 +- ...n.Common => CONFIG_SITE.cygwin-x86.Common} | 4 +-- ...gwin => CONFIG_SITE.cygwin-x86.cygwin-x86} | 4 +-- 6 files changed, 45 insertions(+), 11 deletions(-) create mode 100644 configure/os/CONFIG.Common.cygwin-x86 rename configure/os/{CONFIG.win32-x86-cygwin.Common => CONFIG.cygwin-x86.Common} (64%) rename configure/os/{CONFIG.win32-x86-cygwin.win32-x86-cygwin => CONFIG.cygwin-x86.cygwin-x86} (73%) rename configure/os/{CONFIG_SITE.win32-x86-cygwin.Common => CONFIG_SITE.cygwin-x86.Common} (60%) rename configure/os/{CONFIG_SITE.win32-x86-cygwin.win32-x86-cygwin => CONFIG_SITE.cygwin-x86.cygwin-x86} (51%) diff --git a/configure/os/CONFIG.Common.cygwin-x86 b/configure/os/CONFIG.Common.cygwin-x86 new file mode 100644 index 000000000..4fd877807 --- /dev/null +++ b/configure/os/CONFIG.Common.cygwin-x86 @@ -0,0 +1,34 @@ +# CONFIG.Common.cygwin-x86 +# +# $Id$ +# This file is maintained by the build community. +# +# Definitions for cygwin-x86 target builds +# Sites may override these definitions in CONFIG_SITE.Common.cygwin-x86 +#------------------------------------------------------- + +# Include definitions common to all Unix targets +include $(CONFIG)/os/CONFIG.Common.UnixCommon + +OS_CLASS = cygwin32 +ARCH_CLASS = x86 + +EXE=.exe + +COMPILER_CPPFLAGS = -D_REENTRANT + +#POSIX_CPPFLAGS_YES = -D_POSIX_SOURCE=199506L -D_POSIX_THREADS -D_POSIX_TIMERS +# _POSIX_SOURCE eliminates select() +POSIX_CPPFLAGS_YES = -D_POSIX_THREADS -D_POSIX_TIMERS +#POSIX_LDLIBS_YES += -lpthread +POSIX_LDLIBS_YES += -lpthread + +ARCH_DEP_CPPFLAGS += -D_X86_ + +OP_SYS_CPPFLAGS += -DCYGWIN32 -U_WIN32 + +# Set runtime path for shared libraries +RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_DIRS:%=-Wl,-rpath,%) + +LDLIBS_READLINE = -lcygreadline5 -lcygcurses7 + diff --git a/configure/os/CONFIG.win32-x86-cygwin.Common b/configure/os/CONFIG.cygwin-x86.Common similarity index 64% rename from configure/os/CONFIG.win32-x86-cygwin.Common rename to configure/os/CONFIG.cygwin-x86.Common index 41c530119..b0f6ba932 100644 --- a/configure/os/CONFIG.win32-x86-cygwin.Common +++ b/configure/os/CONFIG.cygwin-x86.Common @@ -1,10 +1,10 @@ -# CONFIG.win32-x86-cygwin.Common +# CONFIG.cygwin-x86.Common # # $Id$ # This file is maintained by the build community. # -# Definitions for win32-x86-cygwin host archs -# Sites may override these definitions in CONFIG_SITE.win32-x86-cygwin.Common +# Definitions for cygwin-x86 host archs +# Sites may override these definitions in CONFIG_SITE.cygwin-x86.Common #------------------------------------------------------- #Include definitions common to unix hosts diff --git a/configure/os/CONFIG.win32-x86-cygwin.win32-x86-cygwin b/configure/os/CONFIG.cygwin-x86.cygwin-x86 similarity index 73% rename from configure/os/CONFIG.win32-x86-cygwin.win32-x86-cygwin rename to configure/os/CONFIG.cygwin-x86.cygwin-x86 index 2c7d2e9b4..37e9c5647 100644 --- a/configure/os/CONFIG.win32-x86-cygwin.win32-x86-cygwin +++ b/configure/os/CONFIG.cygwin-x86.cygwin-x86 @@ -1,9 +1,9 @@ -# CONFIG.win32-x86-cygwin.win32-x86-cygwin +# CONFIG.cygwin-x86.cygwin-x86 # # $Id$ # -# Definitions for win32-x86-cygwin host - win32-x86-cygwin target builds -# Sites may override these definitions in CONFIG_SITE.win32-x86-cygwin.win32-x86-cygwin +# Definitions for cygwin-x86 host - cygwin-x86 target builds +# Sites may override these definitions in CONFIG_SITE.cygwin-x86.cygwin-x86 #------------------------------------------------------- # Include common gnu compiler definitions diff --git a/configure/os/CONFIG_COMPAT b/configure/os/CONFIG_COMPAT index 8e701dd59..1b8469430 100644 --- a/configure/os/CONFIG_COMPAT +++ b/configure/os/CONFIG_COMPAT @@ -16,7 +16,7 @@ ARCH_Darwin = darwin-ppc ARCH_WIN32 = win32-x86 ARCH_hp700 = hpux-parisc ARCH_alpha = osf-alpha -ARCH_cygwin32 = win32-x86-cygwin +ARCH_cygwin32 = cygwin-x86 ARCH_Borland = win32-x86-borland ifndef EPICS_HOST_ARCH diff --git a/configure/os/CONFIG_SITE.win32-x86-cygwin.Common b/configure/os/CONFIG_SITE.cygwin-x86.Common similarity index 60% rename from configure/os/CONFIG_SITE.win32-x86-cygwin.Common rename to configure/os/CONFIG_SITE.cygwin-x86.Common index 07655ebd2..3849fa7f5 100644 --- a/configure/os/CONFIG_SITE.win32-x86-cygwin.Common +++ b/configure/os/CONFIG_SITE.cygwin-x86.Common @@ -1,9 +1,9 @@ -# CONFIG_SITE.win32-x86-cygwin.Common +# CONFIG_SITE.cygwin-x86.Common # # $Id$ # This file is maintained by the build community. # -# Site override definitions for win32-x86-cygwin host builds +# Site override definitions for cygwin-x86 host builds #------------------------------------------------------- CROSS_COMPILER_TARGET_ARCHS = diff --git a/configure/os/CONFIG_SITE.win32-x86-cygwin.win32-x86-cygwin b/configure/os/CONFIG_SITE.cygwin-x86.cygwin-x86 similarity index 51% rename from configure/os/CONFIG_SITE.win32-x86-cygwin.win32-x86-cygwin rename to configure/os/CONFIG_SITE.cygwin-x86.cygwin-x86 index ef25ba96f..9703f5c37 100644 --- a/configure/os/CONFIG_SITE.win32-x86-cygwin.win32-x86-cygwin +++ b/configure/os/CONFIG_SITE.cygwin-x86.cygwin-x86 @@ -1,9 +1,9 @@ -# CONFIG_SITE.win32-x86-cygwin.win32-x86-cygwin +# CONFIG_SITE.cygwin-x86.cygwin-x86 # # $Id$ # This file is maintained by the build community. # -# Site override definitions for win32-x86-cygwin host - win32-x86-cygwin target builds +# Site override definitions for cygwin-x86 host - cygwin-x86 target builds #------------------------------------------------------- ##GNU_DIR=C:/cygwin