diff options
| author | Jose Alonso Cardenas Marquez <acm@FreeBSD.org> | 2024-09-17 08:30:53 +0000 |
|---|---|---|
| committer | Jose Alonso Cardenas Marquez <acm@FreeBSD.org> | 2024-09-17 08:30:53 +0000 |
| commit | 87b2573968f0d09938547e7cf505b0843a0e2c09 (patch) | |
| tree | dbb70c75d2ca410d64f0f3226a8c143f08f9f300 | |
| parent | d3fca50c608f61a3338077da5a946cb61c846929 (diff) | |
lang/fpc-devel: Improve aarch64 support for fpc/lazarus based ports
| -rw-r--r-- | Mk/Uses/fpc.mk | 10 | ||||
| -rw-r--r-- | Mk/Uses/lazarus.mk | 19 | ||||
| -rw-r--r-- | Mk/bsd.default-versions.mk | 4 |
3 files changed, 15 insertions, 18 deletions
diff --git a/Mk/Uses/fpc.mk b/Mk/Uses/fpc.mk index f32b21bf6e64..31b6151aeba4 100644 --- a/Mk/Uses/fpc.mk +++ b/Mk/Uses/fpc.mk @@ -50,14 +50,14 @@ PPNAME= ppca64 PPNAME= ppc_not_yet_ported . endif -. if !defined(WANT_FPC_DEVEL) -FPC_DEVELSUFFIX= # -ONLY_FOR_ARCHS= i386 amd64 -ONLY_FOR_ARCHS_REASON= not yet ported to anything other than i386 and amd64 -. else +. if (defined(WANT_FPC_DEVEL) && !empty(WANT_FPC_DEVEL)) || ${ARCH:Maarch64} FPC_DEVELSUFFIX= -devel ONLY_FOR_ARCHS= i386 amd64 aarch64 ONLY_FOR_ARCHS_REASON= not yet ported to anything other than i386, amd64 and aarch64 +. else +FPC_DEVELSUFFIX= # +ONLY_FOR_ARCHS= i386 amd64 +ONLY_FOR_ARCHS_REASON= not yet ported to anything other than i386 and amd64 . endif BUILD_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils \ diff --git a/Mk/Uses/lazarus.mk b/Mk/Uses/lazarus.mk index 4a9776112c59..ca8cf5cf70b9 100644 --- a/Mk/Uses/lazarus.mk +++ b/Mk/Uses/lazarus.mk @@ -68,13 +68,10 @@ LAZARUS_ARCH= ${ARCH:S/amd64/x86_64/} LAZARUS_PROJECT_FILES?= # empty LAZARUS_DIR?= ${LOCALBASE}/share/lazarus-${LAZARUS_VER} -ONLY_FOR_ARCHS= i386 amd64 -ONLY_FOR_ARCHS_REASON= not yet ported to anything other than i386 and amd64 - -. if !defined(WANT_FPC_DEVEL) -FPC_DEVELSUFFIX= # -. else +. if (defined(WANT_FPC_DEVEL) && !empty(WANT_FPC_DEVEL)) || ${ARCH:Maarch64} FPC_DEVELSUFFIX= -devel +. else +FPC_DEVELSUFFIX= # . endif BUILDNAME= ${LAZARUS_ARCH}-${OPSYS:tl} @@ -102,13 +99,13 @@ FLAVOR= ${FLAVORS:[1]} LAZARUS_PKGNAMESUFFIX= -${FLAVOR} -. if !defined(WANT_LAZARUS_DEVEL) -LAZARUS_DEVELSUFFIX= # -ONLY_FOR_ARCHS= i386 amd64 -ONLY_FOR_ARCHS_REASON= not yet ported to anything other than i386 and amd64 -. else +. if (defined(WANT_LAZARUS_DEVEL) && !empty(WANT_LAZARUS_DEVEL)) || ${ARCH:Maarch64} LAZARUS_DEVELSUFFIX= -devel ONLY_FOR_ARCHS= i386 amd64 aarch64 +ONLY_FOR_ARCHS_REASON= not yet ported to anything other than i386, amd64 and aarch64 +. else +LAZARUS_DEVELSUFFIX= # +ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= not yet ported to anything other than i386 and amd64 . endif diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index 65f8d7c6968e..7764508afae2 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -51,7 +51,7 @@ FIREBIRD_DEFAULT?= 3.0 # Possible values: gfortran FORTRAN_DEFAULT?= gfortran # Possible values: 3.2.3, 3.3.1 -. if defined(WANT_FPC_DEVEL) && !empty(WANT_FPC_DEVEL) +. if (defined(WANT_FPC_DEVEL) && !empty(WANT_FPC_DEVEL)) || ${ARCH:Maarch64} FPC_DEFAULT?= 3.3.1 . else FPC_DEFAULT?= 3.2.3 @@ -76,7 +76,7 @@ IMAGEMAGICK_DEFAULT?= 7 # Possible values: 8, 11, 17, 18, 19, 20, 21 JAVA_DEFAULT?= 8 # Possible values: 3.4.0, 3.99 -. if defined(WANT_LAZARUS_DEVEL) && !empty(WANT_LAZARUS_DEVEL) +. if (defined(WANT_LAZARUS_DEVEL) && !empty(WANT_LAZARUS_DEVEL)) || ${ARCH:Maarch64} LAZARUS_DEFAULT?= 3.99 . else LAZARUS_DEFAULT?= 3.4.0 |