Merge branch 'v3' into v3-node

This commit is contained in:
ThreshMain 2021-03-01 04:10:15 +01:00 committed by GitHub
commit 6eac8f49c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 108 additions and 43 deletions

3
packages/.gitignore vendored
View file

@ -1,2 +1,3 @@
build/
*.pkg.tar.gz
*.pkg.tar.gz
*.tf

View file

@ -5,6 +5,8 @@ PKG_FILES=$(filter-out common.mk,$(wildcard *.mk))
PKG_SLUGS=$(foreach pkg, ${PKG_FILES}, $(addprefix $(shell make -f ${pkg} name VERSION=UNKNOWN)-, $(shell make -f ${pkg} versions VERSION=UNKNOWN)))
# Functions
CALL_MAKE=$(shell make -f $1 $2 VERSION=UNKNOWN)
define pkg_info
$(eval PKG_SLUG=$(patsubst $1-%,%,$2))
$(eval PKG_VERSION=$(lastword $(subst -, ,${PKG_SLUG})))
@ -12,18 +14,27 @@ define pkg_info
$(eval PKG_FILE=$(shell grep '^VERSIONS\s*=.*${PKG_VERSION}' $(shell grep "NAME\s*=\s*${PKG_NAME}" ${PKG_FILES} -l) -l))
endef
define per-lang
build-$(call CALL_MAKE, $1, name):: $$(addprefix build-$(call CALL_MAKE, $1, name)-, $$(call CALL_MAKE, $1, versions))
clean-$(call CALL_MAKE, $1, name):: $$(addprefix clean-$(call CALL_MAKE, $1, name)-, $$(call CALL_MAKE, $1, versions))
endef
# Targets
build: $(foreach pkg, ${PKG_FILES}, $(addprefix build-$(shell make -f ${pkg} name VERSION=UNKNOWN)-, $(lastword $(shell make -f ${pkg} versions VERSION=UNKNOWN))))
$(foreach e,${PKG_FILES}, $(eval $(call per-lang,${e})))
build build-all: $(foreach pkg, ${PKG_FILES}, build-$(call CALL_MAKE, ${pkg}, name))
$(addprefix build-, ${PKG_SLUGS}):
$(call pkg_info,build,$@)
$(MAKE) -f ${PKG_FILE} VERSION=${PKG_VERSION} build
clean: $(foreach pkg, ${PKG_FILES}, $(addprefix clean-$(shell make -f ${pkg} name VERSION=UNKNOWN)-, $(shell make -f ${pkg} versions VERSION=UNKNOWN)))
clean clean-all: $(foreach pkg, ${PKG_FILES}, clean-$(call CALL_MAKE, ${pkg}, name))
rm -rf build/
$(addprefix clean-, ${PKG_SLUGS}):
$(call pkg_info,clean,$@)
$(MAKE) -f ${PKG_FILE} VERSION=${PKG_VERSION} clean

View file

@ -34,11 +34,12 @@ name:
.NOTPARALLEL: build
build: ${BUILD_DIR} ${PKG_FILE}
build: ${BUILD_DIR} ${PKG_FILE} ${PKG_SLUG}.tf
clean:
rm -rf ${BUILD_DIR}
rm -f ${PKG_FILE}
rm -f ${PKG_SLUG}.tf
# mkdir
${BUILD_DIR}:
@ -61,7 +62,8 @@ $(patsubst %.json,%.jq,${INFO_FILE}):
echo '.build_platform="$(or ${PLATFORM}, baremetal-$(shell grep -oP "^ID=\K\w+" /etc/os-release ))"' >> $@
$(foreach dep, ${DEPENDENCIES}, echo '.dependencies.$(word 1,$(subst =, ,${dep}))="$(word 2,$(subst =, ,${dep}))"' >> $@)
${PKG_SLUG}.tf:
cp ${NAME}.test $@
# Helpers
%/: %.tar.gz

24
packages/php.mk Normal file
View file

@ -0,0 +1,24 @@
NAME=php
AUTHOR=Martin Kos <martinkos007@gmail.com>
DEPENDENCIES=
COMPILED=false
VERSIONS=7.4.15 8.0.2
include common.mk
${RUN_FILE}:
echo 'php $$*' > $@
${ENV_FILE}:
echo 'export PATH=$$PWD/bin:$$PATH' > $@
${BIN_DIR}: ${BUILD_DIR}php-${VERSION}-sources/
$(eval TMP_DIR=${PWD}/${BUILD_DIR}tmpout)
cd $< && ./configure --prefix ${PREFIX}
$(MAKE) -C $<
INSTALL_ROOT=${TMP_DIR}/ $(MAKE) -C $< install
mv ${TMP_DIR}${PREFIX} ${BIN_DIR} && rm -r ${TMP_DIR}
${BUILD_DIR}php-${VERSION}-sources.tar.gz:
curl "https://www.php.net/distributions/php-${VERSION}.tar.gz" -o $@

3
packages/php.test Normal file
View file

@ -0,0 +1,3 @@
<?php
echo "OK";
?>

View file

@ -2,7 +2,7 @@ NAME=python
AUTHOR=Thomas Hobson <thomas@hexf.me>
DEPENDENCIES=
COMPILED=false
VERSIONS=2.7.1 3.5.1 3.9.1
VERSIONS=3.5.1 3.9.1
include common.mk
@ -15,6 +15,7 @@ ${ENV_FILE}:
${BIN_DIR}: ${BUILD_DIR}Python-${VERSION}/
$(eval TMP_DIR=${PWD}/${BUILD_DIR}tmpout/)
cd $< && ./configure --prefix ${PREFIX}
$(MAKE) -C $<
DESTDIR=${TMP_DIR} $(MAKE) -C $< altinstall