cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

devel/fpm: unbreak build on 32bit platform

Browse Source 
backport https://github.com/fortran-lang/fpm/pull/796
This commit is contained in:
semarie 2022-11-18 11:09:13 +00:00
parent 3f1814e0d2
commit 22ed150156
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devel/fpm/Makefile
View File

@ -1,6 +1,7 @@
COMMENT = Fortran Package Manager COMMENT = Fortran Package Manager
V = 0.7.0 V = 0.7.0
REVISION = 0
GH_ACCOUNT = fortran-lang GH_ACCOUNT = fortran-lang
GH_PROJECT = fpm GH_PROJECT = fpm
@ -25,7 +26,7 @@ DISTFILES = ${GH_DISTFILE} \
# external dependencies (see fpm.toml) # external dependencies (see fpm.toml)
TOMLF_COMMIT = e49f5523e4ee67db6628618864504448fb8c8939 TOMLF_COMMIT = e49f5523e4ee67db6628618864504448fb8c8939
MCLI2_COMMIT = ea6bbffc1c2fb0885e994d37ccf0029c99b19f24 MCLI2_COMMIT = 90a1a146e19c8ad37b0469b8cbd04bc28eb67a50
EXTRACT_CASES += \ EXTRACT_CASES += \
*.F90) install -m 0644 ${FULLDISTDIR}/$$archive ${WRKDIR};; *.F90) install -m 0644 ${FULLDISTDIR}/$$archive ${WRKDIR};;
@ -50,17 +51,18 @@ MAKE_ENV += FPM_FC="${MODFORTRAN_COMPILER}" \
FC = ${MODFORTRAN_COMPILER} FC = ${MODFORTRAN_COMPILER}
FFLAGS += FFLAGS +=
FPM_SRC0 = ${WRKDIR}/fpm-${V}.F90 FPM_SRC0 = ${WRKSRC}/fpm-bootstrap.F90
FPM_BIN0 = ${WRKBUILD}/stage0/fpm FPM_BIN0 = ${WRKBUILD}/stage0/fpm
FPM_BIN1 = ${WRKBUILD}/stage1/fpm FPM_BIN1 = ${WRKBUILD}/stage1/fpm
post-extract: post-extract:
mv ${WRKDIR}/fpm-${V}.F90 ${FPM_SRC0}
mkdir ${WRKSRC}/vendor mkdir ${WRKSRC}/vendor
mv ${WRKDIR}/toml-f-${TOMLF_COMMIT} ${WRKSRC}/vendor/toml-f mv ${WRKDIR}/toml-f-${TOMLF_COMMIT} ${WRKSRC}/vendor/toml-f
mv ${WRKDIR}/M_CLI2-${MCLI2_COMMIT} ${WRKSRC}/vendor/M_CLI2 mv ${WRKDIR}/M_CLI2-${MCLI2_COMMIT} ${WRKSRC}/vendor/M_CLI2
do-build: do-build:
mkdir ${WRKBUILD}/{stage0,stage1,stage2} mkdir -p ${WRKBUILD}/{stage0,stage1,stage2}
# build the bootstrap (stage0) # build the bootstrap (stage0)
if [ "${FPM_SRC0}" -nt "${FPM_BIN0}" ]; then \ if [ "${FPM_SRC0}" -nt "${FPM_BIN0}" ]; then \

4
devel/fpm/distinfo
View File

@ -1,8 +1,8 @@
SHA256 (M_CLI2-ea6bbffc.tar.gz) = e0laSGDA/zmO34aUoScwoB1aB7WMnRICnUle9K/uy8I= SHA256 (M_CLI2-90a1a146.tar.gz) = oDHnw7+UxlItLTC2t7160qjZ+a21aOn8e1m09XFrODM=
SHA256 (fpm-0.7.0.F90) = 0W5FtwUCnW04sLp8zKsrnttIwvKUQUc1SLhm2gOJJD4= SHA256 (fpm-0.7.0.F90) = 0W5FtwUCnW04sLp8zKsrnttIwvKUQUc1SLhm2gOJJD4=
SHA256 (fpm-0.7.0.tar.gz) = nXaZD90HB9MJcpFh9ThwN3f6HP8X+KncWWzuhGUp4k8= SHA256 (fpm-0.7.0.tar.gz) = nXaZD90HB9MJcpFh9ThwN3f6HP8X+KncWWzuhGUp4k8=
SHA256 (toml-f-e49f5523.tar.gz) = 2m9bhp5VnKEt4bQPGoWj9f8IDy5I8xaHVINHesw+ERo= SHA256 (toml-f-e49f5523.tar.gz) = 2m9bhp5VnKEt4bQPGoWj9f8IDy5I8xaHVINHesw+ERo=
SIZE (M_CLI2-ea6bbffc.tar.gz) = 1219604 SIZE (M_CLI2-90a1a146.tar.gz) = 13771712
SIZE (fpm-0.7.0.F90) = 985847 SIZE (fpm-0.7.0.F90) = 985847
SIZE (fpm-0.7.0.tar.gz) = 169412 SIZE (fpm-0.7.0.tar.gz) = 169412
SIZE (toml-f-e49f5523.tar.gz) = 94071 SIZE (toml-f-e49f5523.tar.gz) = 94071