ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

python3: simplify code in makefile

Browse Source 
Mac never executes this code. See

$(if $(filter MACOSX,$(OS)),GeneratedPackage_python3,ExternalPackage_python3)

in external/python3/Module_python3.mk

Change-Id: I928f480945279f13f8ff3c398ddbbed133b9d9ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183369
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Tested-by: Jenkins
This commit is contained in:
Xisco Fauli
2025-03-27 11:11:39 +01:00
parent 177189b17d
commit 9b0668b6c5
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
external/python3/ExternalPackage_python3.mk
Vendored
+2 -10
View File
@@ -137,14 +137,6 @@ endif
# headers are not delivered, but used from unpacked dir Include/
# (+ toplevel for pyconfig.h)
ifeq ($(OS),LINUX)
python3_MACHDEP=linux
else
ifeq ($(OS),MACOSX)
python3_MACHDEP=darwin
endif
endif
# that one is generated...
ifeq ($(HOST_PLATFORM),powerpc64le-unknown-linux-gnu)
$(eval $(call gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib,\
@@ -161,11 +153,11 @@ else
ifneq ($(OS),WNT)
ifeq ($(CPUNAME),ARM)
$(eval $(call gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib,\
LO_lib/_sysconfigdata_$(if $(ENABLE_DBGUTIL),d)_$(python3_MACHDEP)_$(subst i686,i386,$(subst v7l-unknown,,$(HOST_PLATFORM))).py \
LO_lib/_sysconfigdata_$(if $(ENABLE_DBGUTIL),d)_linux_$(subst i686,i386,$(subst v7l-unknown,,$(HOST_PLATFORM))).py \
))
else
$(eval $(call gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib,\
LO_lib/_sysconfigdata_$(if $(ENABLE_DBGUTIL),d)_$(python3_MACHDEP)_$(subst i686,i386,$(subst -pc,,$(HOST_PLATFORM))).py \
LO_lib/_sysconfigdata_$(if $(ENABLE_DBGUTIL),d)_linux_$(subst i686,i386,$(subst -pc,,$(HOST_PLATFORM))).py \
))
endif
endif