head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.4 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.2 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.1.0.2 pkgsrc-2025Q3-base:1.1; locks; strict; comment @# @; 1.2 date 2025.10.03.11.54.06; author dkazankov; state Exp; branches; next 1.1; commitid Yv5NRUb0BLYyn7dG; 1.1 date 2025.09.04.13.02.46; author dkazankov; state Exp; branches; next ; commitid QyTZKc1iItmUGo9G; desc @@ 1.2 log @ada-aws-25: fix build error caused incorrect zlib detection and building @ text @$NetBSD: patch-makefile.conf,v 1.1 2025/09/04 13:02:46 dkazankov Exp $ Add externally settable options for gprbuild Add NetBSD support --- makefile.conf.orig 2024-12-20 16:02:53.000000000 +0200 +++ makefile.conf @@@@ -5,7 +5,7 @@@@ # # IMPORTANT: each time you change the definitions here make sure you run # $ make setup - +GPRBUILD_OPTIONS = # 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 else +ifeq ($(strip $(findstring netbsd, $(TARGET))),netbsd) + PRJ_TARGET = freebsd +else PRJ_TARGET = UNIX endif +endif OS = UNIX endif endif @@@@ -289,7 +293,7 @@@@ -XPRJ_TARGET=$(PRJ_TARGET) -XTARGET=$(TARGET) \ -XTHREAD_SANITIZER=$(THREAD_SANITIZER) \ -XSSL_DYNAMIC=$(SSL_DYNAMIC) -XTGT_DIR=$(TGT_DIR) \ - $(GPROOTOPTS) + $(GPROOTOPTS) $(GPRBUILD_OPTIONS) export GPROPTS GPR_STATIC = -XLIBRARY_TYPE=static -XXMLADA_BUILD=static @ 1.1 log @www/ada-aws-25: add new package 25.1.0 Ada Web Server @ text @d1 1 a1 1 $NetBSD: patch-makefile.conf,v 1.0 2024/12/17 20:00:00 dkazankov Exp $ d17 18 @