stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8303691: Fedora based devkit build should load more packages from archive location

Browse Source 
Reviewed-by: mbaesken, erikj
This commit is contained in:
Christoph Langer 2023-03-09 21:59:12 +00:00
parent e930b63a8f
commit 562c8fc668
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
make/devkit/Tools.gmk
View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -71,6 +71,7 @@ else ifeq ($(BASE_OS), Fedora)
BASE_URL := http://fedora.riscv.rocks/repos-dist/$(BASE_OS_VERSION)/$(ARCH)/Packages/ BASE_URL := http://fedora.riscv.rocks/repos-dist/$(BASE_OS_VERSION)/$(ARCH)/Packages/
else else
DEFAULT_OS_VERSION := 27 DEFAULT_OS_VERSION := 27
LATEST_ARCHIVED_OS_VERSION := 35
ifeq ($(BASE_OS_VERSION), ) ifeq ($(BASE_OS_VERSION), )
BASE_OS_VERSION := $(DEFAULT_OS_VERSION) BASE_OS_VERSION := $(DEFAULT_OS_VERSION)
endif endif
@ -79,11 +80,11 @@ else ifeq ($(BASE_OS), Fedora)
else else
FEDORA_TYPE := fedora/linux FEDORA_TYPE := fedora/linux
endif endif
ARCHIVED := $(shell [ $(BASE_OS_VERSION) -lt $(DEFAULT_OS_VERSION) ] && echo true) NOT_ARCHIVED := $(shell [ $(BASE_OS_VERSION) -gt $(LATEST_ARCHIVED_OS_VERSION) ] && echo true)
ifeq ($(ARCHIVED),true) ifeq ($(NOT_ARCHIVED),true)
BASE_URL := https://archives.fedoraproject.org/pub/archive/$(FEDORA_TYPE)/releases/$(BASE_OS_VERSION)/Everything/$(ARCH)/os/Packages/
else
BASE_URL := https://dl.fedoraproject.org/pub/$(FEDORA_TYPE)/releases/$(BASE_OS_VERSION)/Everything/$(ARCH)/os/Packages/ BASE_URL := https://dl.fedoraproject.org/pub/$(FEDORA_TYPE)/releases/$(BASE_OS_VERSION)/Everything/$(ARCH)/os/Packages/
else
BASE_URL := https://archives.fedoraproject.org/pub/archive/$(FEDORA_TYPE)/releases/$(BASE_OS_VERSION)/Everything/$(ARCH)/os/Packages/
endif endif
endif endif
LINUX_VERSION := Fedora_$(BASE_OS_VERSION) LINUX_VERSION := Fedora_$(BASE_OS_VERSION)
@ -449,7 +450,7 @@ $(BUILDDIR)/$(binutils_ver)/Makefile \
$(PATHPRE) $(ENVS) CFLAGS="-O2 $(CFLAGS)" \ $(PATHPRE) $(ENVS) CFLAGS="-O2 $(CFLAGS)" \
$(BINUTILS_CFG) \ $(BINUTILS_CFG) \
$(CONFIG) \ $(CONFIG) \
$(LINKER_CONFIG) \ $(LINKER_CONFIG) \
--with-sysroot=$(SYSROOT) \ --with-sysroot=$(SYSROOT) \
--disable-nls \ --disable-nls \
--program-prefix=$(TARGET)- \ --program-prefix=$(TARGET)- \