EPICS_base/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Revert PR #589

Browse Source 
* Revert "Release Notes for PYTHON=python3"
  commit 2612b47c3f.

* Revert "Remove Python build dependency when LINKER_USE_RPATH=ORIGIN"
  commit f4c474eb77.
This commit is contained in:
Andrew Johnson
2025-02-19 14:10:16 -06:00
committed by GitHub
parent 7a6e11cae0
commit a3d8531008
6 changed files with 94 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
configure/CONFIG_BASE
View File

@ -54,7 +54,8 @@ CONVERTRELEASE = $(PERL) $(call FIND_TOOL,convertRelease.pl)
FILTERMAKEFLAGS = $(PERL) $(call FIND_TOOL,filterMakeflags.pl)
FULLPATHNAME = $(PERL) $(TOOLS)/fullPathName.pl
GENVERSIONHEADER = $(PERL) $(TOOLS)/genVersionHeader.pl $(QUIET_FLAG) $(QUESTION_FLAG)
MAKERPATH = $(PERL) $(TOOLS)/makeRPath.pl
MAKERPATH = $(PYTHON) $(TOOLS)/makeRPath.py
#---------------------------------------------------------------
# tools for installing libraries and products

8
configure/CONFIG_COMMON
View File

@ -34,11 +34,11 @@ CROSS2 = $(CROSS_COMPILER_TARGET_ARCHS$(filter-out 1,$(words $(filter $(EPICS_HO
BUILD_ARCHS = $(EPICS_HOST_ARCH) $(CROSS1) $(CROSS2)
#-------------------------------------------------------
# Defaults for Perl and Python assume they're on $PATH.
# Python (now python3) is only needed by developers, when building docs.
# Override these in os/CONFIG_SITE.<host_arch>.Common or CONFIG_SITE.local
# Default for perl if it's on the PATH,
# otherwise override this in os/CONFIG_SITE.<host_arch>.Common
PERL = perl -CSD
PYTHON = python3
PYTHON = python
#-------------------------------------------------------
# Check configure/RELEASE file for consistency