pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
devel/alire: Update to 2.0.1nb1
Module Name: pkgsrc-wip
Committed By: Dmytro Kazankov <dmytro.kazankov%gmail.com@localhost>
Pushed By: dkazankov
Date: Tue May 21 12:18:29 2024 +0300
Changeset: a9a60fea6f1e712f3d30f7e1073e626dcef3022c
Modified Files:
alire/Makefile
alire/PLIST
alire/buildlink3.mk
alire/distinfo
alire/patches/patch-alire.gpr
alire/patches/patch-alire__common.gpr
alire/patches/patch-alr.gpr
alire/patches/patch-alr__env.gpr
Removed Files:
alire/files/buildlink.cgpr
Log Message:
devel/alire: Update to 2.0.1nb1
* Package updated to upstream 2.0.1 release.
* Build type changed to "release" to avoid runtime exceptions:
some patches added/changed, Makefile modified.
* Build process moved to gprbuild.mk, so wip version of gprbuild
required to build
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a9a60fea6f1e712f3d30f7e1073e626dcef3022c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
alire/Makefile | 50 ++++--------
alire/PLIST | 4 +-
alire/buildlink3.mk | 9 ++-
alire/distinfo | 8 +-
alire/files/buildlink.cgpr | 143 ----------------------------------
alire/patches/patch-alire.gpr | 8 +-
alire/patches/patch-alire__common.gpr | 8 +-
alire/patches/patch-alr.gpr | 8 +-
alire/patches/patch-alr__env.gpr | 5 +-
9 files changed, 43 insertions(+), 200 deletions(-)
diffs:
diff --git a/alire/Makefile b/alire/Makefile
index 21afb3d2f7..fe5989a9fd 100644
--- a/alire/Makefile
+++ b/alire/Makefile
@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.3 2024/05/02 14:00:00 dkazankov Exp $
.include "version.mk"
-PKGNAME=alire-${ALIRE_VERSION}
-
+PKGNAME= alire-${ALIRE_VERSION}
+PKGREVISION= 1
CATEGORIES= devel
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://github.com/alire-project/alire
@@ -11,12 +11,17 @@ LICENSE= gnu-gpl-v3
USE_LANGUAGES= c ada
+MKPIE_SUPPORTED= no
+RELRO_SUPPORTED= no
+
.include "../../mk/bsd.prefs.mk"
-DISTNAME= ${PKGNAME}
+GCC_REQD+= 13
+
+DISTNAME= alire-${PKGVERSION_NOREV}
GITHUB_PROJECT= alire
GITHUB_TYPE= tag
-GITHUB_TAG= v${ALIRE_VERSION}
+GITHUB_TAG= v${PKGVERSION_NOREV}
MASTER_SITES= ${MASTER_SITE_GITHUB:=alire-project/}
GITHUB_SUBMODULES+= mosteo aaa dff61d2615cc6332fa6205267bae19b4d044b9da deps/aaa
@@ -39,41 +44,14 @@ GITHUB_SUBMODULES+= mosteo umwi 32496c15fe4fbb6cdab54ea11fbb0815549d2d48 deps/um
GITHUB_SUBMODULES+= mosteo uri-ada 02a0780d7757e9e79b3410c3a34960655cacea3d deps/uri-ada
GITHUB_SUBMODULES+= alire-project xmlezout 1fcbd0b9303d044d8f09a8ef652afa8c0400ee8b deps/xmlezout
-GCC_REQD+= 13
-
-.include "../../devel/gprbuild/buildlink3.mk"
+MAKE_FILE= alr_env.gpr
+MAKE_ENV= ALIRE_OS=netbsd ALIRE_BUILD_MODE=release
-CGPRDIR= ${WRKDIR}
-
-SUBST_CLASSES+= buildlink
-SUBST_STAGE.buildlink= post-configure
-SUBST_FILES.buildlink= ../buildlink.cgpr
-SUBST_MESSAGE.buildlink= Set work directory path in config project
-SUBST_VARS.buildlink= WRKDIR
-
-MAKE_ENV+= ALIRE_OS=netbsd ALIRE_BUILD_MODE=release
-MAKE_PROGRAM= gprbuild
-MAKE_FILE= alr_env
-MAKE_FLAGS= -j0 -p -P
-BUILD_MAKE_FLAGS= --config=${CGPRDIR}/buildlink.cgpr
+# Use GPRBuild as main build system
+.include "../../wip/gprbuild/gprbuild.mk"
GENERATE_PLIST+= \
cd ${DESTDIR}${PREFIX} && \
- ${FIND} bin \( -type f -or -type l \) -print | ${SORT};
-
-pre-configure:
- ${RUN} ${CP} ${PKGDIR}/files/buildlink.cgpr ${CGPRDIR}/
-
-do-build:
- ${RUN} \
- cd ${WRKSRC} \
- && env ${MAKE_ENV} \
- ${MAKE_PROGRAM} ${MAKE_FLAGS} ${MAKE_FILE} ${BUILD_MAKE_FLAGS}
-
-do-install:
- ${RUN} \
- cd ${WRKSRC} \
- && mkdir -p ${DESTDIR}${PREFIX}/bin \
- && install -m0755 bin/alr ${DESTDIR}${PREFIX}/bin
+ ${FIND} bin share \( -type f -or -type l \) -print | ${SORT};
.include "../../mk/bsd.pkg.mk"
diff --git a/alire/PLIST b/alire/PLIST
index c781c96d46..f57dd41cb5 100644
--- a/alire/PLIST
+++ b/alire/PLIST
@@ -1,2 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2024/03/12 17:53:15 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2024/05/09 12:30:00 dkazankov Exp $
bin/alr
+share/gpr/manifests/alr
+share/gpr/manifests/alr_env
diff --git a/alire/buildlink3.mk b/alire/buildlink3.mk
index 258a09777f..969ce33801 100644
--- a/alire/buildlink3.mk
+++ b/alire/buildlink3.mk
@@ -6,9 +6,16 @@ BUILDLINK_TREE+= alire
ALIRE_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.alire+= alire>=2.0.0rc1
-BUILDLINK_PKGSRCDIR.alire= ../../devel/alire
+BUILDLINK_PKGSRCDIR.alire= ../../wip/alire
BUILDLINK_DEPMETHOD.alire?= build
+BUILDLINK_AUTO_VARS.alire= no
+BUILDLINK_AUTO_DIRS.alire= no
+
+BUILDLINK_FILES.alire= bin/alr share/gpr/manifests/alr*
+BUILDLINK_CONTENTS_FILTER.alire= \
+ ${EGREP} '(bin/alr|share/gpr/manifests/alr.*)'
+
.endif
BUILDLINK_TREE+= -alire
diff --git a/alire/distinfo b/alire/distinfo
index a58d01d3d6..d6a4ea5a0d 100644
--- a/alire/distinfo
+++ b/alire/distinfo
@@ -60,11 +60,11 @@ Size (mosteo-umwi-32496c15fe4fbb6cdab54ea11fbb0815549d2d48.tar.gz) = 437897 byte
BLAKE2s (mosteo-uri-ada-02a0780d7757e9e79b3410c3a34960655cacea3d.tar.gz) = a6472407535c2e2395c6dba586b65643a7289f32c6af7a847fc237ec1dd0f6af
SHA512 (mosteo-uri-ada-02a0780d7757e9e79b3410c3a34960655cacea3d.tar.gz) = d84eb9bd63da554eb640bc0c78ded538f787e10bd7e1a17e9e505ffda84d6c99e86d855afb9964fe005559b9050fba9c9fdc3f51b5a11d390394e56a25154496
Size (mosteo-uri-ada-02a0780d7757e9e79b3410c3a34960655cacea3d.tar.gz) = 6287 bytes
-SHA1 (patch-alire.gpr) = 571c790ca413b971dd5d676ced8188ed1761b687
+SHA1 (patch-alire.gpr) = ebf7fcaf357325e397e39800a3c5a06096ca6239
SHA1 (patch-alire.toml) = 1280a937949b5ad76290ecbff522f87f729110bc
-SHA1 (patch-alire__common.gpr) = cf1e619be52eb021b421ea18c8b24a54108fc524
-SHA1 (patch-alr.gpr) = 5068ad3dc2efef1aa33dbc57debea6e872f9f70f
-SHA1 (patch-alr__env.gpr) = 3baec4b2d39fee5024ff3e1201603433767dce5a
+SHA1 (patch-alire__common.gpr) = 57d61af7069a95bbfaddc912d042163d5e2d753a
+SHA1 (patch-alr.gpr) = a139b3a1b1cf816cf6855f5b3bb62d33a2479241
+SHA1 (patch-alr__env.gpr) = 178423cd94a803487a5461c210d68aa3b6131b3d
SHA1 (patch-src_alire_alire-directories.adb) = fe7ed9aa36626b14628c783dd1e5cd1fcd0ca9cc
SHA1 (patch-src_alire_alire-platforms.ads) = 00fa7512b670a6500425608963493aade1c8512c
SHA1 (patch-src_alire_os__netbsd_alire-check__absolute__path.adb) = f7893dabd3d51d64c708aa690d0c46136ffebc67
diff --git a/alire/files/buildlink.cgpr b/alire/files/buildlink.cgpr
deleted file mode 100644
index 6f75ccdbfe..0000000000
--- a/alire/files/buildlink.cgpr
+++ /dev/null
@@ -1,143 +0,0 @@
-configuration project default is
- for Target use "x86_64-netbsd";
- for Canonical_Target use "x86_64-netbsd";
- for Inherit_Source_Path ("C++") use ("C");
- for Inherit_Source_Path ("Asm_Cpp") use ("Asm");
- for Default_Language use "Ada";
-
- for Archive_Builder use ("ar", "cr");
- for Archive_Builder_Append_Option use ("q");
- for Archive_Indexer use ("ranlib");
- for Archive_Suffix use ".a";
-
- for Symbolic_Link_Supported use "true";
- for Library_Major_Minor_Id_Supported use "true";
- for Library_Builder use "@WRKDIR@/.buildlink/libexec/gprbuild/gprlib";
- for Library_Support use "full";
- for Shared_Library_Prefix use "lib";
- for Shared_Library_Minimum_Switches use ("-shared");
- for Library_Version_Switches use ("-Wl,-soname,");
-
- for Shared_Library_Suffix use ".so";
- for Library_Auto_Init_Supported use "true";
- for Run_Path_Option use ("-Wl,-z,origin,-rpath,");
- for Run_Path_Origin use "$ORIGIN";
- for Library_Encapsulated_Supported use "true";
- for Library_Encapsulated_Options use ("-shared", "-static-libgcc");
-
- for Toolchain_Version ("Ada") use "GNAT 13.2.0";
- for Runtime_Dir ("Ada") use "@WRKDIR@/.buildlink/gcc13-gnat/lib/gcc/x86_64--netbsd/13.2.0";
-
- package Builder is
- for Executable_Suffix use "";
- end Builder;
-
- package Compiler is
- for Driver ("Ada") use "@WRKDIR@/.gcc/bin/gcc";
- for Driver ("C") use "@WRKDIR@/.gcc/bin/gcc";
- for Driver ("C++") use "@WRKDIR@/.gcc/bin/g++";
- for Language_Kind ("Ada") use "unit_based";
- for Dependency_Kind ("Ada") use "ALI_File";
- for Leading_Required_Switches ("Ada") use
- ("-c", "-x", "ada", "-gnatA")
- & Compiler'Leading_Required_Switches ("Ada");
-
- for Mapping_File_Switches ("Ada") use ("-gnatem=");
- for Mapping_Spec_Suffix ("Ada") use "%s";
- for Mapping_Body_Suffix ("Ada") use "%b";
- for Config_File_Switches ("Ada") use ("-gnatec=");
- for Include_Path_File ("Ada") use "ADA_PRJ_INCLUDE_FILE";
-
- for Multi_Unit_Switches ("Ada") use ("-gnateI");
- for Multi_Unit_Object_Separator ("Ada") use "~";
- for Config_Body_File_Name ("Ada") use
- "pragma Source_File_Name_Project (%u, Body_File_Name => ""%f"");";
- for Config_Spec_File_Name ("Ada") use
- "pragma Source_File_Name_Project (%u, Spec_File_Name => ""%f"");";
- for Config_Body_File_Name_Index ("Ada") use
- "pragma Source_File_Name_Project (%u, Body_File_Name => ""%f"", Index => %i);";
- for Config_Spec_File_Name_Index ("Ada") use
- "pragma Source_File_Name_Project (%u, Spec_File_Name => ""%f"", Index => %i);";
- for Config_Body_File_Name_Pattern ("Ada") use
- "pragma Source_File_Name_Project " &
- " (Body_File_Name => ""*%b""," &
- " Casing => %c," &
- " Dot_Replacement => ""%d"");";
- for Config_Spec_File_Name_Pattern ("Ada") use
- "pragma Source_File_Name_Project " &
- " (Spec_File_Name => ""*%s""," &
- " Casing => %c," &
- " Dot_Replacement => ""%d"");";
- for Config_File_Unique ("Ada") use "False";
- for Leading_Required_Switches ("Ada") use
- Compiler'Leading_Required_Switches ("Ada") & ("--RTS=@WRKDIR@/.buildlink/gcc13-gnat/lib/gcc/x86_64--netbsd/13.2.0");
-
- for Leading_Required_Switches ("C") use
- ("-c", "-x", "c") & Compiler'Leading_Required_Switches ("C");
- for Include_Switches_Via_Spec ("C") use ("cc1", "-I");
- for Max_Command_Line_Length use "8192";
- for Response_File_Format ("C") use "GCC_GNU";
- for Dependency_Switches ("C") use ("-MMD", "-MF", "");
- for PIC_Option ("C") use ("-fPIC");
-
- for Leading_Required_Switches ("C++") use
- ("-c", "-x", "c++") &
- Compiler'Leading_Required_Switches ("C++");
- for Dependency_Switches ("C++") use ("-MMD", "-MF", "");
- for Include_Switches_Via_Spec ("C++") use ("cc1plus", "-I");
- for Max_Command_Line_Length use "8192";
- for Response_File_Format ("C++") use "GCC_GNU";
- for PIC_Option ("C++") use ("-fPIC");
- end Compiler;
-
- package Naming is
- for Spec_Suffix ("Ada") use ".ads";
- for Body_Suffix ("Ada") use ".adb";
-
- for Body_Suffix ("Asm") use ".s";
- for Body_Suffix ("Asm2") use ".asm";
- for Body_Suffix ("Asm_Cpp") use ".S";
-
- for Body_Suffix ("C") use ".c";
- for Spec_Suffix ("C") use ".h";
-
- for Spec_Suffix ("C++") use ".hh";
- for Body_Suffix ("C++") use ".cpp";
-
- for Body_Suffix ("Fortran") use ".f";
-
- for Casing use "lowercase";
- for Dot_Replacement use "-";
- end Naming;
-
- package Binder is
- for Objects_Path_File ("Ada") use "ADA_PRJ_OBJECTS_FILE";
- for Driver ("Ada") use
- "@WRKDIR@/.buildlink/libexec/gprbuild/gprbind";
- for Required_Switches ("Ada") use
- Binder'Required_Switches ("Ada") & ("--RTS=@WRKDIR@/.buildlink/gcc13-gnat/lib/gcc/x86_64--netbsd/13.2.0");
- end Binder;
-
- package Linker is
- for Map_File_Option use "-Wl,-Map,";
- for Driver use Compiler'Driver ("Ada");
- for Driver use Compiler'Driver ("C++");
- for Response_File_Format use "GNU";
- for Max_Command_Line_Length use "8192";
- end Linker;
-
- package Clean is
- for Source_Artifact_Extensions ("Ada") use (".dg", ".rep");
- for Object_Artifact_Extensions ("Ada") use (".s", ".ci", ".gcno", ".su");
-
- for Source_Artifact_Extensions ("C") use (".gli");
- for Object_Artifact_Extensions ("C") use (".s", "ci", ".gcno", ".su");
-
- for Source_Artifact_Extensions ("C++") use (".gli");
- for Object_Artifact_Extensions ("C++") use (".s", "ci", ".gcno", ".su");
- -- Remove the files generated by gnatinspect (in the context of GPS)
- for Artifacts_In_Object_Dir use Clean'Artifacts_In_Object_Dir
- & ("gnatinspect.*");
- end Clean;
-
-end default;
diff --git a/alire/patches/patch-alire.gpr b/alire/patches/patch-alire.gpr
index 676350ee15..f807b767dc 100644
--- a/alire/patches/patch-alire.gpr
+++ b/alire/patches/patch-alire.gpr
@@ -2,9 +2,9 @@ $NetBSD: patch-alire.gpr,v 1.1 2024/03/12 17:53:16 wiz Exp $
Add NetBSD support
---- alire.gpr.orig 2023-10-19 15:04:21.000000000 +0000
-+++ alire.gpr
-@@ -28,6 +28,7 @@ library project Alire is
+--- alire.gpr.orig 2024-03-21 00:22:58.000000000 +0200
++++ alire.gpr 2024-05-10 07:51:00.859589350 +0300
+@@ -28,6 +28,7 @@
case Alire_Common.Host_Os is
when "freebsd" => Src_Dirs := Src_Dirs & ("src/alire/os_freebsd");
@@ -12,7 +12,7 @@ Add NetBSD support
when "linux" => Src_Dirs := Src_Dirs & ("src/alire/os_linux");
when "macos" => Src_Dirs := Src_Dirs & ("src/alire/os_macos");
when "windows" => Src_Dirs := Src_Dirs & ("src/alire/os_windows");
-@@ -38,6 +39,9 @@ library project Alire is
+@@ -38,6 +39,9 @@
when "freebsd" =>
for body ("Alire.Platforms.Current") use "alire-platforms-current__freebsd.adb";
for body ("Alire.Platforms.Folders") use "alire-platforms-folders__freebsd.adb";
diff --git a/alire/patches/patch-alire__common.gpr b/alire/patches/patch-alire__common.gpr
index 0e5fe994e6..a36f5b940f 100644
--- a/alire/patches/patch-alire__common.gpr
+++ b/alire/patches/patch-alire__common.gpr
@@ -3,7 +3,7 @@ $NetBSD: patch-alire__common.gpr,v 1.2 2024/05/02 14:00:00 dkazankov Exp $
Add NetBSD support, fix switches for release build (avoiding runtime exceptions)
--- alire_common.gpr.orig 2024-03-21 00:22:58.000000000 +0200
-+++ alire_common.gpr 2024-05-02 12:42:35.176534243 +0300
++++ alire_common.gpr 2024-05-10 08:10:43.529091158 +0300
@@ -4,6 +4,7 @@
type Host_OSes is ("linux",
@@ -12,14 +12,12 @@ Add NetBSD support, fix switches for release build (avoiding runtime exceptions)
"macos",
"windows");
-@@ -107,8 +108,8 @@
+@@ -107,7 +108,7 @@
"-fPIC",
-- Enable lots of extra runtime checks
- "-gnatVa", "-gnatwa", "-gnato", "-fstack-check", "-gnata",
-- "-gnatf", "-fPIC")
+ "-gnatwa", "-gnato",
-+ "-gnatf")
+ "-gnatf", "-fPIC")
& Style_Check_Switches;
- for Default_Switches ("C") use ("-g", "-O2", "-Wall", "-fPIC");
diff --git a/alire/patches/patch-alr.gpr b/alire/patches/patch-alr.gpr
index 3be95b7bbe..01455c9435 100644
--- a/alire/patches/patch-alr.gpr
+++ b/alire/patches/patch-alr.gpr
@@ -1,10 +1,10 @@
-$NetBSD: patch-alr.gpr,v 1.1 2024/03/12 17:53:16 wiz Exp $
+$NetBSD: patch-alr.gpr,v 1.2 2024/05/10 00:00:00 dkazankov Exp $
Add NetBSD support
---- alr.gpr.orig 2023-10-19 15:04:21.000000000 +0000
-+++ alr.gpr
-@@ -14,6 +14,7 @@ project Alr is
+--- alr.gpr.orig 2024-03-21 00:22:58.000000000 +0200
++++ alr.gpr 2024-05-10 08:12:04.438483173 +0300
+@@ -14,6 +14,7 @@
case Alire_Common.Host_Os is
when "freebsd" => Src_Dirs := Src_Dirs & ("src/alr/os_linux");
diff --git a/alire/patches/patch-alr__env.gpr b/alire/patches/patch-alr__env.gpr
index 92674c80b3..e8ad508f06 100644
--- a/alire/patches/patch-alr__env.gpr
+++ b/alire/patches/patch-alr__env.gpr
@@ -1,9 +1,10 @@
$NetBSD: patch-alr__env.gpr,v 1.2 2024/05/02 14:00:00 dkazankov Exp $
-Add NetBSD support, change build type to avoid runtime check exceptions
+Add NetBSD support
+Change build type to avoid runtime check exceptions
--- alr_env.gpr.orig 2024-03-21 00:22:58.000000000 +0200
-+++ alr_env.gpr 2024-04-19 19:44:22.676754538 +0300
++++ alr_env.gpr 2024-05-09 22:22:21.844009442 +0300
@@ -36,13 +36,14 @@
case Alire_Common.Host_Os is
Home |
Main Index |
Thread Index |
Old Index