Support for configure/RELEASE.<hostarch>.<targetarch> files
This commit is contained in:
@@ -23,6 +23,7 @@ CONFIG ?= $(TOP)/configure
|
||||
|
||||
-include $(CONFIG)/RELEASE
|
||||
-include $(CONFIG)/RELEASE.$(EPICS_HOST_ARCH)
|
||||
-include $(CONFIG)/RELEASE.Common.$(T_A)
|
||||
-include $(CONFIG)/RELEASE.$(EPICS_HOST_ARCH).$(T_A)
|
||||
|
||||
include $(CONFIG)/CONFIG_COMMON
|
||||
|
||||
@@ -76,12 +76,20 @@ $outfile = $ARGV[0];
|
||||
|
||||
# Read the RELEASE file(s)
|
||||
$relfile = "$top/configure/RELEASE";
|
||||
die "Can't find configure/RELEASE file" unless (-f $relfile);
|
||||
die "Can't find configure/RELEASE file" unless (-r $relfile);
|
||||
&readRelease($relfile, \%macros, \@apps);
|
||||
|
||||
if ($hostarch) {
|
||||
$relfile .= ".$hostarch";
|
||||
&readRelease($relfile, \%macros, \@apps) if (-r $relfile);
|
||||
my ($hrelfile) = "$relfile.$hostarch";
|
||||
&readRelease($hrelfile, \%macros, \@apps) if (-r $hrelfile);
|
||||
}
|
||||
if ($arch) {
|
||||
my ($crelfile) = "$relfile.Common.$arch";
|
||||
&readRelease($crelfile, \%macros, \@apps) if (-r $crelfile);
|
||||
if ($hostarch) {
|
||||
my ($arelfile) = "$relfile.$hostarch.$arch";
|
||||
&readRelease($arelfile, \%macros, \@apps) if (-r $arelfile);
|
||||
}
|
||||
}
|
||||
&expandRelease(\%macros, \@apps);
|
||||
|
||||
|
||||
@@ -2,8 +2,12 @@
|
||||
|
||||
include $(TOP)/configure/RELEASE
|
||||
-include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH)
|
||||
-include $(TOP)/configure/RELEASE.Common.$(T_A)
|
||||
-include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).$(T_A)
|
||||
|
||||
CONFIG=$(EPICS_BASE)/configure
|
||||
include $(CONFIG)/CONFIG
|
||||
|
||||
INSTALL_LOCATION = $(TOP)
|
||||
ifdef INSTALL_LOCATION_APP
|
||||
INSTALL_LOCATION = $(INSTALL_LOCATION_APP)
|
||||
|
||||
Reference in New Issue
Block a user