diff --git a/configure/CONFIG_ADDONS b/configure/CONFIG_ADDONS index e8ce09190..f6b6b8481 100644 --- a/configure/CONFIG_ADDONS +++ b/configure/CONFIG_ADDONS @@ -26,7 +26,6 @@ # USR_CFLAGS C flags # USR_CXXFLAGS C++ flags # USR_CPPFLAGS c preprocesser flags -# INC include-files to install # SRCS source files for building libraries and prods # USR_SRCS source files for building libraries and prods # PROD_SRCS source files for building prods diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE index d5353a474..6c7f08239 100644 --- a/configure/CONFIG_SITE +++ b/configure/CONFIG_SITE @@ -23,6 +23,7 @@ # darwin-x86 (Intel based Apple running OSX) # freebsd-x86 (GNU compiler used for host builds) # freebsd-x86_64 (GNU compiler used for host builds) +# linux-arm (GNU compiler used for host builds) # linux-ppc (GNU compiler used for host builds) # linux-ppc64 (GNU compiler used for host builds) # linux-x86 (GNU compiler used for host builds) @@ -37,10 +38,13 @@ # solaris-x86_64-gnu (GNU compiler used for host builds) # win32-x86 (MS Visual C++ compiler used for host builds) # win32-x86-mingw (MinGW compiler used for host builds) +# win32-x86-static (MS Visual C++ compiler used for host builds) # windows-x64 (MS Visual C++ compiler used for host builds) # windows-x64-mingw (MinGW compiler used for host builds) +# windows-x64-static (MS Visual C++ compiler used for host builds) # Debugging builds: +# linux-arm-debug (GNU compiler used for host builds) # linux-x86-debug (GNU compiler with -g option for host builds) # linux-x86_64-debug (GNU compiler with -g option for host builds) # solaris-sparc-debug (sun compiler no optimization,-g for debugging info) @@ -57,13 +61,13 @@ # # Currently Supporting: -# ios-arm -# ios-386 +# ios-arm (darwin-x86 host) +# ios-386 (darwin-x86 host) # linux-386 (linux-x86 host) # linux-486 (linux-x86 host) # linux-586 (linux-x86 host) # linux-686 (linux-x86 host) -# linux-arm (linux-x86 host) +# linux-arm (linux-x86 or -x86_64 host) # linux-arm_eb (linux-x86 host) # linux-arm_el (linux-x86 host) # linux-athlon (linux-x86 host) @@ -98,6 +102,7 @@ # RTEMS-pc386 # RTEMS-psim # RTEMS-uC5282 +# win32-x86-mingw (linux-x86 or -x86_64 host) # # Which target architectures to cross-compile for. diff --git a/configure/os/CONFIG.Common.RTEMS-mvme2100 b/configure/os/CONFIG.Common.RTEMS-mvme2100 index 9f7eeefca..aac3650fd 100644 --- a/configure/os/CONFIG.Common.RTEMS-mvme2100 +++ b/configure/os/CONFIG.Common.RTEMS-mvme2100 @@ -1,5 +1,5 @@ # -# CONFIG.Common.RTEMS-mvme3100 +# CONFIG.Common.RTEMS-mvme2100 # $Revision-Id$ # Author: W. Eric Norum # diff --git a/configure/os/CONFIG.Common.linux-arm b/configure/os/CONFIG.Common.linux-arm index 15dad9e9e..a305523eb 100644 --- a/configure/os/CONFIG.Common.linux-arm +++ b/configure/os/CONFIG.Common.linux-arm @@ -1,9 +1,7 @@ # CONFIG.Common.linux-arm # -# This file is maintained by the build community. -# # Definitions for linux-arm target builds -# Sites may override these definitions in CONFIG_SITE.Common.linux-arm +# Override these settings in CONFIG_SITE.Common.linux-arm #------------------------------------------------------- # Include definitions common to all Linux targets @@ -11,26 +9,3 @@ include $(CONFIG)/os/CONFIG.Common.linuxCommon ARCH_CLASS = arm -ifeq ($(BUILD_CLASS),CROSS) - VALID_BUILDS = Ioc - GNU_TARGET = arm-linux - - # prefix of compiler tools - CMPLR_SUFFIX = - CMPLR_PREFIX = $(addsuffix -,$(GNU_TARGET)) - - # Provide a link-time path for shared libraries - SHRLIBDIR_RPATH_LDFLAGS_YES += $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath-link,%) - SHRLIBDIR_LDFLAGS += $(SHRLIBDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH)) - - # Provide a link-time path for products - PRODDIR_RPATH_LDFLAGS_YES += $(PROD_DEPLIB_DIRS:%=-Wl,-rpath-link,%) - PRODDIR_LDFLAGS += $(PRODDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH)) - - # Provide a link-time path for readline - RUNTIME_LDFLAGS_READLINE_YES = -Wl,-rpath-link,$(GNU_DIR)/lib - RUNTIME_LDFLAGS_READLINE = $(RUNTIME_LDFLAGS_READLINE_$(LINKER_USE_RPATH)) - RUNTIME_LDFLAGS_READLINE_CURSES = $(RUNTIME_LDFLAGS_READLINE_$(LINKER_USE_RPATH)) - RUNTIME_LDFLAGS_READLINE_NCURSES = $(RUNTIME_LDFLAGS_READLINE_$(LINKER_USE_RPATH)) - -endif diff --git a/configure/os/CONFIG.linux-x86.linux-arm b/configure/os/CONFIG.linux-x86.linux-arm index 2d38bfcc9..e2cf36a52 100644 --- a/configure/os/CONFIG.linux-x86.linux-arm +++ b/configure/os/CONFIG.linux-x86.linux-arm @@ -1,10 +1,31 @@ # CONFIG.linux-x86.linux-arm # # Definitions for linux-x86 host - linux-arm target builds -# Sites may override these definitions in CONFIG_SITE.linux-x86.linux-arm +# Override these settings in CONFIG_SITE.linux-x86.linux-arm #------------------------------------------------------- -# Copied from x86.x86 +VALID_BUILDS = Ioc +GNU_TARGET = arm-linux + +# prefix of compiler tools +CMPLR_SUFFIX = +CMPLR_PREFIX = $(addsuffix -,$(GNU_TARGET)) + +# Provide a link-time path for shared libraries +SHRLIBDIR_RPATH_LDFLAGS_YES += $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath-link,%) +SHRLIBDIR_LDFLAGS += $(SHRLIBDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH)) + +# Provide a link-time path for products +PRODDIR_RPATH_LDFLAGS_YES += $(PROD_DEPLIB_DIRS:%=-Wl,-rpath-link,%) +PRODDIR_LDFLAGS += $(PRODDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH)) + +# Provide a link-time path for readline +RUNTIME_LDFLAGS_READLINE_YES = -Wl,-rpath-link,$(GNU_DIR)/lib +RUNTIME_LDFLAGS_READLINE = $(RUNTIME_LDFLAGS_READLINE_$(LINKER_USE_RPATH)) +RUNTIME_LDFLAGS_READLINE_CURSES = $(RUNTIME_LDFLAGS_READLINE_$(LINKER_USE_RPATH)) +RUNTIME_LDFLAGS_READLINE_NCURSES = $(RUNTIME_LDFLAGS_READLINE_$(LINKER_USE_RPATH)) + +# Library flags STATIC_LDFLAGS_YES= -Wl,-Bstatic STATIC_LDFLAGS_NO= STATIC_LDLIBS_YES= -Wl,-Bdynamic diff --git a/configure/os/CONFIG.linux-x86.linux-arm-debug b/configure/os/CONFIG.linux-x86.linux-arm-debug new file mode 100644 index 000000000..16dad62c3 --- /dev/null +++ b/configure/os/CONFIG.linux-x86.linux-arm-debug @@ -0,0 +1,9 @@ +# CONFIG.linux-x86.linux-arm-debug +# +# Definitions for linux-x86 host - linux-arm-debug target builds +# Override these settings in CONFIG_SITE.linux-x86.linux-arm-debug +#------------------------------------------------------- + +# Include definitions for linux-arm targets +include $(CONFIG)/os/CONFIG.linux-x86.linux-arm + diff --git a/configure/os/CONFIG.linux-x86_64.linux-arm b/configure/os/CONFIG.linux-x86_64.linux-arm new file mode 100644 index 000000000..38cd888ad --- /dev/null +++ b/configure/os/CONFIG.linux-x86_64.linux-arm @@ -0,0 +1,8 @@ +# CONFIG.linux-x86_64.linux-arm +# +# Definitions for linux-x86_64 host - linux-arm target builds +# Sites may override these definitions in CONFIG_SITE.linux-x86_64.linux-arm +#------------------------------------------------------- + +include $(CONFIG)/os/CONFIG.linux-x86.linux-arm + diff --git a/configure/os/CONFIG.linux-x86_64.linux-arm-debug b/configure/os/CONFIG.linux-x86_64.linux-arm-debug new file mode 100644 index 000000000..3feb41089 --- /dev/null +++ b/configure/os/CONFIG.linux-x86_64.linux-arm-debug @@ -0,0 +1,8 @@ +# CONFIG.linux-x86_64.linux-arm-debug +# +# Definitions for linux-x86_64 host - linux-arm-debug target builds +# Override these settings in CONFIG_SITE.linux-x86_64.linux-arm-debug +#------------------------------------------------------- + +include $(CONFIG)/os/CONFIG.linux-x86.linux-arm + diff --git a/configure/os/CONFIG.solaris-sparc64.Common b/configure/os/CONFIG.solaris-sparc64.Common index b153adcf0..e62d51750 100644 --- a/configure/os/CONFIG.solaris-sparc64.Common +++ b/configure/os/CONFIG.solaris-sparc64.Common @@ -3,7 +3,7 @@ # $Revision-Id$ # This file is maintained by the build community. # -# Definitions for solaris-sparc Sun compiler host builds +# Definitions for solaris-sparc64 Sun compiler host builds # Sites may override these definitions in CONFIG_SITE.solaris-sparc64.Common #------------------------------------------------------- diff --git a/configure/os/CONFIG.solaris-sparc64.solaris-sparc64 b/configure/os/CONFIG.solaris-sparc64.solaris-sparc64 index fd44a4f84..451ecde08 100644 --- a/configure/os/CONFIG.solaris-sparc64.solaris-sparc64 +++ b/configure/os/CONFIG.solaris-sparc64.solaris-sparc64 @@ -3,7 +3,7 @@ # $Revision-Id$ # This file is maintained by the build community. # -# Definitions for solaris-sparc Sun compiler host - solaris-sparc Sun compiler target builds +# Definitions for solaris-sparc64 compiler host - solaris-sparc64 compiler target builds # Sites may override these definitions in CONFIG_SITE.solaris-sparc64.solaris-sparc64 #------------------------------------------------------- diff --git a/configure/os/CONFIG.solarisCommon.solarisCommon b/configure/os/CONFIG.solarisCommon.solarisCommon index c864a34f0..aa5e035d0 100644 --- a/configure/os/CONFIG.solarisCommon.solarisCommon +++ b/configure/os/CONFIG.solarisCommon.solarisCommon @@ -3,8 +3,8 @@ # $Revision-Id$ # This file is maintained by the build community. # -# Definitions for solaris-sparc host - solaris-sparc target build -# Sites may override these definitions in CONFIG_SITE.solaris-sparc.solaris-sparc +# Definitions for solaris host - solaris target build +# Sites may override these definitions in CONFIG_SITE.solarisCommon.solarisCommon #------------------------------------------------------- CMPLR_CLASS = solStudio diff --git a/configure/os/CONFIG_SITE.Common.RTEMS b/configure/os/CONFIG_SITE.Common.RTEMS index a276bfa47..d2cccea67 100644 --- a/configure/os/CONFIG_SITE.Common.RTEMS +++ b/configure/os/CONFIG_SITE.Common.RTEMS @@ -1,12 +1,15 @@ +# CONFIG_SITE.Common.RTEMS +# +# $Revision-Id$ # # Site-specific information for all RTEMS targets -# #------------------------------------------------------- # Where to find RTEMS # +# APS: RTEMS_VERSION = 4.10.2 -RTEMS_BASE = /usr/local/rtems/rtems-$(RTEMS_VERSION) +RTEMS_BASE = /usr/local/vw/rtems/rtems-$(RTEMS_VERSION) # Cross-compile toolchain in $(RTEMS_TOOLS)/bin # @@ -17,7 +20,7 @@ RTEMS_TOOLS = $(RTEMS_BASE) # A GeSys object is similar to a shared library. It can be (un)loaded # at runtime by the Generic System loader which is available as a # patch against RTEMS. -USE_GESYS=NO +USE_GESYS = NO # If you're using neither BOOTP/DHCP nor FLASH to pick up your IOC # network configuration you must uncomment and specify your Internet diff --git a/configure/os/CONFIG_SITE.Common.iosCommon b/configure/os/CONFIG_SITE.Common.iosCommon index de51f6153..a964c5bca 100644 --- a/configure/os/CONFIG_SITE.Common.iosCommon +++ b/configure/os/CONFIG_SITE.Common.iosCommon @@ -12,10 +12,14 @@ #IOS_DEPLOYMENT_TARGET = 5.1 #IOS_DEPLOYMENT_TARGET = 6.0 #IOS_DEPLOYMENT_TARGET = 6.1 -IOS_DEPLOYMENT_TARGET = 7.0 -#IOS_DEPLOYMENT_TARGET = 8.0 +#IOS_DEPLOYMENT_TARGET = 7.0 +#IOS_DEPLOYMENT_TARGET = 7.1 +IOS_DEPLOYMENT_TARGET = 8.0 #IOS_DEPLOYMENT_TARGET = 8.1 +# Older versions of Xcode may require this SDK_DIR definition +#SDK_DIR = $(PLATFORM_DIR)/Developer/SDKs/$(IOS_PLATFORM)$(IOS_DEPLOYMENT_TARGET).sdk + # Which compiler to use: # CLANG is required for Xcode 5.0 and later diff --git a/configure/os/CONFIG_SITE.Common.linux-arm b/configure/os/CONFIG_SITE.Common.linux-arm index 466dffe15..0e78404cc 100644 --- a/configure/os/CONFIG_SITE.Common.linux-arm +++ b/configure/os/CONFIG_SITE.Common.linux-arm @@ -2,8 +2,8 @@ # # $Revision-Id$ # -# Site Specific definitions for linux-arm target -# Only the local epics system manager should modify this file +# Site Specific definitions for all linux-arm targets +#------------------------------------------------------- # NOTE for SHARED_LIBRARIES: In most cases if this is set to YES the # shared libraries will be found automatically. However if the .so diff --git a/configure/os/CONFIG_SITE.Common.linux-xscale_be b/configure/os/CONFIG_SITE.Common.linux-xscale_be index 0d28a4e2a..226aebac6 100644 --- a/configure/os/CONFIG_SITE.Common.linux-xscale_be +++ b/configure/os/CONFIG_SITE.Common.linux-xscale_be @@ -1,9 +1,12 @@ # CONFIG_SITE.Common.linux-xscale_be # +# $Revision-Id$ +# # Site specific definitions for linux-xscale_be target builds. #------------------------------------------------------- # Set GNU_DIR to point to directory containing the tool-chain -GNU_DIR = /usr/local/xscale_be +# APS: +GNU_DIR = /usr/local/vw/xscale_be diff --git a/configure/os/CONFIG_SITE.linux-x86.linux-arm b/configure/os/CONFIG_SITE.linux-x86.linux-arm index f27a6a0cd..528c9bc6c 100644 --- a/configure/os/CONFIG_SITE.linux-x86.linux-arm +++ b/configure/os/CONFIG_SITE.linux-x86.linux-arm @@ -1,4 +1,4 @@ -# CONFIG_SITE.linux-x86.linux-arm +# CONFIG_SITE.linux-x86.linux-arm # # $Revision-Id$ # @@ -8,7 +8,8 @@ # Tools install path #GNU_DIR = /home/targetOS/linux-arm/host/x86-linux/gcc_3.3.3 -GNU_DIR = /net/phoebus/vw/zynq-2011.09 +# APS: +GNU_DIR = /usr/local/vw/zynq-2011.09 # GNU crosscompiler target name GNU_TARGET = arm-xilinx-linux-gnueabi diff --git a/src/ca/client/perl/Makefile b/src/ca/client/perl/Makefile index 2ad98ec42..bac6e347a 100644 --- a/src/ca/client/perl/Makefile +++ b/src/ca/client/perl/Makefile @@ -24,9 +24,8 @@ PERL_VERSION = $(shell $(PERL) ../perlConfig.pl version) PERL_ARCHNAME = $(shell $(PERL) ../perlConfig.pl archname) PERL_ARCHPATH = $(PERL_VERSION)/$(PERL_ARCHNAME) -ifeq ($(findstring Host,$(VALID_BUILDS)),Host) -ifeq ($(findstring $(OS_CLASS),WIN32 cygwin32),) - # Doesn't build on WIN32 +ifeq ($(T_A),$(EPICS_HOST_ARCH)) # No cross-builds (wrong Perl!) +ifeq ($(findstring $(OS_CLASS),WIN32 cygwin32),) # Doesn't build on WIN32 LOADABLE_LIBRARY_HOST = Cap5 PERL_SCRIPTS += cainfo.pl