소스 검색

Fixing RELOCATABLE variable null value issue

(cherry picked from commit e40c8701835e2f2d96356b9f83f0ae49f3ca5c4a)
Change-Id: I24c6bf419fce403f39247ae894644f899296f115
Prakash Ranade 7 달 전
부모
커밋
b8abf7e7a1
2개의 변경된 파일22개의 추가작업 그리고 5개의 파일을 삭제
  1. 1 0
      Makefile
  2. 21 5
      Makefile.vars

+ 1 - 0
Makefile

@@ -159,6 +159,7 @@ $(BLD_DIR_ENV)/bin/python:
 	@mkdir -p $(BLD_DIR_ENV)
 	@$(SYS_PYTHON) -m pip install --upgrade pip==$(PIP_VERSION)
 	@$(SYS_PYTHON) -m pip install virtualenv==$(VIRTUAL_ENV_VERSION) virtualenv-make-relocatable==$(VIRTUAL_ENV_RELOCATABLE_VERSION)
+	@$(eval RELOCATABLE := $(shell which virtualenv-make-relocatable))
 	@$(SYS_PYTHON) -m virtualenv -p $(PYTHON_VER) $(BLD_DIR_ENV) --copies
 	@echo "REQUIREMENT_FILE is $(REQUIREMENT_FILE)"
 	@$(ENV_PIP) install -r $(REQUIREMENT_FILE)

+ 21 - 5
Makefile.vars

@@ -153,17 +153,33 @@ NAVOPTAPI_WHL := $(ROOT)/desktop/core/wheels/navoptapi-1.0.0-py3-none-any.whl
 LOCAL_PY_BASE := $(shell $(SYS_PYTHON) -m site --user-base)
 LOCAL_PY_BIN := $(LOCAL_PY_BASE)/bin
 export PATH := $(PATH):$(LOCAL_PY_BIN)
-RELOCATABLE := $(shell which virtualenv-make-relocatable)
-
 ##############################
 # Set specific versions for some libraries
 ##############################
 PIP_VERSION := 22.2.2
 VIRTUAL_ENV_RELOCATABLE_VERSION := 0.0.1
 
-# Set VIRTUAL_ENV_VERSION based on PYTHON_VER
-ifeq ($(PYTHON_VER),python3.9)
+##############################
+# Set specific versions for some libraries
+##############################
+ifeq ($(PYTHON_VER),python3.8)
+  PIP_VERSION := 22.2.2
+  VIRTUAL_ENV_VERSION := 20.24.4
+  VIRTUAL_ENV_RELOCATABLE_VERSION := 0.0.1
+  REQUIREMENT_PPC64LE_FILE := $(ROOT)/desktop/core/requirements_ppc64le.txt
+else ifeq ($(PYTHON_VER),python3.9)
+  PIP_VERSION := 22.2.2
   VIRTUAL_ENV_VERSION := 20.19.0
-else
+  VIRTUAL_ENV_RELOCATABLE_VERSION := 0.0.1
+  REQUIREMENT_PPC64LE_FILE := $(ROOT)/desktop/core/requirements_ppc64le_py39.txt
+else ifeq ($(PYTHON_VER),python3.10)
+  PIP_VERSION := 22.2.2
   VIRTUAL_ENV_VERSION := 20.24.4
+  VIRTUAL_ENV_RELOCATABLE_VERSION := 0.0.1
+else ifeq ($(PYTHON_VER),python3.11)
+  PIP_VERSION := 22.2.2
+  VIRTUAL_ENV_VERSION := 20.24.4
+  VIRTUAL_ENV_RELOCATABLE_VERSION := 0.0.1
 endif
+
+RELOCATABLE := $(shell which virtualenv-make-relocatable)