pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/www/ada-aws-25
Module Name: pkgsrc
Committed By: dkazankov
Date: Fri Oct 3 11:54:06 UTC 2025
Modified Files:
pkgsrc/www/ada-aws-25: Makefile distinfo
pkgsrc/www/ada-aws-25/patches: patch-makefile.conf
Added Files:
pkgsrc/www/ada-aws-25/patches: patch-include_zlib_zlib.gpr
Log Message:
ada-aws-25: fix build error caused incorrect zlib detection and building
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/ada-aws-25/Makefile \
pkgsrc/www/ada-aws-25/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/www/ada-aws-25/patches/patch-include_zlib_zlib.gpr
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/ada-aws-25/patches/patch-makefile.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/www/ada-aws-25/Makefile
diff -u pkgsrc/www/ada-aws-25/Makefile:1.1 pkgsrc/www/ada-aws-25/Makefile:1.2
--- pkgsrc/www/ada-aws-25/Makefile:1.1 Thu Sep 4 13:02:46 2025
+++ pkgsrc/www/ada-aws-25/Makefile Fri Oct 3 11:54:06 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2025/09/04 13:02:46 dkazankov Exp $
+# $NetBSD: Makefile,v 1.2 2025/10/03 11:54:06 dkazankov Exp $
DISTNAME= ${GITHUB_PROJECT}-${PKGVERSION_NOREV}
PKGNAME= ${GITHUB_PROJECT}-${GNAT_NAME}-25.1.0
@@ -12,7 +12,7 @@ HOMEPAGE= https://github.com/AdaCore/aws
COMMENT= Ada Web Server
LICENSE= gnu-gpl-v3
-GITHUB_SUBMODULES+= AdaCore templates-parser v25.0.0 templates_parser
+#GITHUB_SUBMODULES+= AdaCore templates-parser v25.0.0 templates_parser
USE_LANGUAGES= c ada
@@ -30,11 +30,11 @@ LIBRARY_PATH?= # empty
.include "options.mk"
-SUBST_CLASSES+= version1
-SUBST_MESSAGE.version1= Fix version number in ${SUBST_FILES.version1}
-SUBST_STAGE.version1= post-extract
-SUBST_FILES.version1= templates_parser/Makefile
-SUBST_SED.version1= -e "s,22.0,25.1,"
+#SUBST_CLASSES+= version1
+#SUBST_MESSAGE.version1= Fix version number in ${SUBST_FILES.version1}
+#SUBST_STAGE.version1= post-extract
+#SUBST_FILES.version1= templates_parser/Makefile
+#SUBST_SED.version1= -e "s,22.0,25.1,"
SUBST_CLASSES+= version2
SUBST_MESSAGE.version2= Fix version number in ${SUBST_FILES.version2}
@@ -83,6 +83,16 @@ BUILDLINK_DEPMETHOD.libadalang-25= full
CONFIGURE_ARGS+= ENABLE_SHARED=false
.endif
+CHECK_BUILTIN.zlib:= yes
+.include "../../devel/zlib/builtin.mk"
+CHECK_BUILTIN.zlib:= no
+.if ${USE_BUILTIN.zlib:tl} == yes
+MAKE_ENV+= ZLIB_PATH=/usr/lib
+.else
+.include "../../devel/zlib/buildlink3.mk"
+MAKE_ENV+= ZLIB_PATH=${PREFIX}/lib
+.endif
+
CHECK_PIE_SKIP+= ${GNAT_PKGBASE}/bin/*
CHECK_RELRO_SKIP+= ${GNAT_PKGBASE}/lib/*.so
@@ -94,6 +104,8 @@ PRINT_PLIST_AWK+= /\.relocatable\/|\.sta
.include "../../devel/gprbuild/buildlink3.mk"
+.include "../../textproc/ada-templates-parser-25/inplace.mk"
+
.include "../../textproc/ada-xmlada-25/buildlink3.mk"
.include "../../devel/ada-libgpr-25/buildlink3.mk"
.include "../../devel/ada-gnatcoll-core-25/buildlink3.mk"
Index: pkgsrc/www/ada-aws-25/distinfo
diff -u pkgsrc/www/ada-aws-25/distinfo:1.1 pkgsrc/www/ada-aws-25/distinfo:1.2
--- pkgsrc/www/ada-aws-25/distinfo:1.1 Thu Sep 4 13:02:46 2025
+++ pkgsrc/www/ada-aws-25/distinfo Fri Oct 3 11:54:06 2025
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.1 2025/09/04 13:02:46 dkazankov Exp $
+$NetBSD: distinfo,v 1.2 2025/10/03 11:54:06 dkazankov Exp $
-BLAKE2s (AdaCore-templates-parser-v25.0.0.tar.gz) = 87196226137489c985fea3d1dd2994eeefb0ec8e168546081361a1bfa2e42114
-SHA512 (AdaCore-templates-parser-v25.0.0.tar.gz) = 902e41f713dd8446e08ba6f180b4c88c35d37da3476d0c925a4b6a05fb5038ff9ec1b0daa0443a55e82f902867b774efb4e28c0b7d8ec59fb15d050ee523ee87
-Size (AdaCore-templates-parser-v25.0.0.tar.gz) = 259459 bytes
BLAKE2s (aws-25.1.0.tar.gz) = 9b6cdc5716a0fbe9a585cd5b1042eb8ae1b42854efb5edfcef26bcbe3193a460
SHA512 (aws-25.1.0.tar.gz) = 854ea57f0c769e455b8644c60aecfdbbe2fd7417732abe271de557f72b44ff231305e356cedcf1036225ea1215170eaec195c7fad164e6c14e04bf0687b1a38a
Size (aws-25.1.0.tar.gz) = 2505055 bytes
-SHA1 (patch-makefile.conf) = d460da5fe181b33044aac43447d3b03d90d3295d
+SHA1 (patch-include_zlib_zlib.gpr) = 80b2d39a21cfb3c1d07653f0f05829a8e5841db7
+SHA1 (patch-makefile.conf) = c13a56589a7e0bf5c35ceb1d1e5e38558e37c7b9
SHA1 (patch-tools_tools.gpr) = f63a9cd964ce9b0360d32347ecd5306e3d8f1c52
Index: pkgsrc/www/ada-aws-25/patches/patch-makefile.conf
diff -u pkgsrc/www/ada-aws-25/patches/patch-makefile.conf:1.1 pkgsrc/www/ada-aws-25/patches/patch-makefile.conf:1.2
--- pkgsrc/www/ada-aws-25/patches/patch-makefile.conf:1.1 Thu Sep 4 13:02:46 2025
+++ pkgsrc/www/ada-aws-25/patches/patch-makefile.conf Fri Oct 3 11:54:06 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-makefile.conf,v 1.1 2025/09/04 13:02:46 dkazankov Exp $
+$NetBSD: patch-makefile.conf,v 1.2 2025/10/03 11:54:06 dkazankov Exp $
Add externally settable options for gprbuild
Add NetBSD support
@@ -14,6 +14,24 @@ Add NetBSD support
# Is out of tree build
ifneq ($(BLD_DIR), $(SRC_DIR))
GPROOTOPTS = --relocate-build-tree=$(BLD_DIR) --root-dir=$(SRC_DIR)
+@@ -50,7 +50,7 @@
+ ENABLE_SHARED=$(shell gprbuild -c -q -p $(GPROOTOPTS) \
+ -XTARGET=$(TARGET) -XPRJ_TARGET=$(PRJ_TARGET) \
+ -XTGT_DIR=$(TGT_DIR) \
+- -P$(SRC_DIR)/config/setup/test_shared 2>/dev/null \
++ -P$(SRC_DIR)/config/setup/test_shared $(GPRBUILD_OPTIONS) 2>/dev/null \
+ && echo "true")
+
+ ##############################################################################
+@@ -92,7 +92,7 @@
+ ZLIB = $(shell gprbuild -q -p $(GPROOTOPTS) \
+ -XTARGET=$(TARGET) -XPRJ_TARGET=$(PRJ_TARGET) \
+ -XTGT_DIR=$(TGT_DIR) \
+- -Pconfig/setup/test_zlib 2>/dev/null \
++ -Pconfig/setup/test_zlib $(GPRBUILD_OPTIONS) 2>/dev/null \
+ && $(BLD_DIR)/$(TARGET)/setup/zobj/mzlib \
+ && echo "true")
+
@@ -213,8 +213,12 @@
ifeq ($(strip $(findstring freebsd, $(TARGET))),freebsd)
PRJ_TARGET = freebsd
Added files:
Index: pkgsrc/www/ada-aws-25/patches/patch-include_zlib_zlib.gpr
diff -u /dev/null pkgsrc/www/ada-aws-25/patches/patch-include_zlib_zlib.gpr:1.1
--- /dev/null Fri Oct 3 11:54:06 2025
+++ pkgsrc/www/ada-aws-25/patches/patch-include_zlib_zlib.gpr Fri Oct 3 11:54:06 2025
@@ -0,0 +1,35 @@
+$NetBSD: patch-include_zlib_zlib.gpr,v 1.1 2025/10/03 11:54:06 dkazankov Exp $
+
+Build zlib when it is not present only
+
+--- include/zlib/zlib.gpr.orig 2024-12-20 16:02:53.000000000 +0200
++++ include/zlib/zlib.gpr
+@@ -30,26 +30,21 @@
+
+ type Yes_No is ("Yes", "No");
+ Zlib_Activated : Yes_No := "No";
++ Zlib_Path := External("ZLIB_PATH", ".");
+
+ -- Always build the static Z library as needed by some AWS tools
+
+- case Shared.Library_Type is
+- when "static" | "static-pic" =>
+- Zlib_Activated := "Yes";
+-
+- when "relocatable" =>
+ case AWS_Config.Zlib_Exists is
+ when "true" =>
+ Zlib_Activated := "No";
+ when "false" =>
+ Zlib_Activated := "Yes";
+ end case;
+- end case;
+
+ case ZLib_Activated is
+ when "No" =>
+ for Source_Dirs use ();
+- for Library_Dir use ".";
++ for Library_Dir use Zlib_Path;
+ for Externally_Built use "true";
+ when "Yes" =>
+ for Source_Dirs use (".");
Home |
Main Index |
Thread Index |
Old Index