From nobody Thu Jan 02 03:27:36 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YNsbD4TwPz5jvCf; Thu, 02 Jan 2025 03:27:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YNsbD3kz0z4Spf; Thu, 2 Jan 2025 03:27:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735788456; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lF65wStY6/zDXYnk33T21A2wz0UUhSorBgqH3qtsSpM=; b=SUpkxV9FzGHAKCaJk1/g5ZwjQ0jJjW33esO+x32kIKv49X3SKRo0SGRbhLUpcMBqWEmOq+ CPApaKLrme45VVEsuxzm9DBbzRS08gB4iQ87yuMh7/ZfVBy7RzKYkqyfWWBIOFI0RXx9tu QygCK1ZYb5AfcpjMX54vA6kluqrCsgOMohLBMkIsJ2aBn6qb7zheG+JMG+4HYsDuv9I+J5 Cjf6q0QYf4fun453TLM+TKsGTTe3GrkPxS/qYt0mDmABSRratWfUCmn3s5dWxg1DXua8Ny PZjdK8Yz9NtU4Vv5bib/MewBR19Ujrfi3rf8h84G6rUXlGbc2D7grsIx1IPAVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735788456; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lF65wStY6/zDXYnk33T21A2wz0UUhSorBgqH3qtsSpM=; b=Bp9KiZU1FXVd83FEUFwDitWZh7U1hsDCWZ1n02rUylzWFoIrIzJmdXNvOms31KhTVqg2ND hztAZ+h6se9K7EhB1NDbMOd+FIe6rWzHoCuPjz4b2lWARu+PCWaMTb+3WBozMR4nd6x1fA 6Ozk93lmwvJX8MPs0hZy3IVwQVpDMf3m/trLTfSeQHmdDv31Fm7AyXw8Dm2+MVkDjJj1/W ethn/IkzFK6EHiOcRnRfqjXPPC/ODQCJ1+60yDsL1rNabbNleVNTFVnD4ERIc8PvfLpPX8 WlbJgY0ENtSEo8Rxt3xojp7h6/QHXs+3kWpQQbDBSRIvKnI1qBlc1JVEaqXVlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735788456; a=rsa-sha256; cv=none; b=TqCdDKySl3Nc4ZaJ8Da239qVd+D8qMnArog91I+rv1TbPOKViv077Yepqton1O7MlWifUj Ry6psFcQa+Mrl0WJ1yro4BbbzhSbLZ45PGdltqx0xOgp+dSUxHUrjFs0t5+jmSkX6nJFRo /D7tjpNG6r4hyfEq3Hr+L595zz4DNnBHdrsP5D26Kw/Cq1ELpVyxP/59jqcGppEQxbQXP+ xpOTvdgkpq2Srtq6KEw6E4a+ryrSPy5ecu4TM61HphJnLWeVHUTnG+xIBdGRDGZM87uiSG L1oX4BTdkCl2+0/9vEQeSeNp8FtqVztHCJEftN9js6dQxuPefr+kuk4tYMBksg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YNsbD3LGFzrp1; Thu, 2 Jan 2025 03:27:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5023RaOF079524; Thu, 2 Jan 2025 03:27:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5023RaH0079521; Thu, 2 Jan 2025 03:27:36 GMT (envelope-from git) Date: Thu, 2 Jan 2025 03:27:36 GMT Message-Id: <202501020327.5023RaH0079521@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jose Alonso Cardenas Marquez Subject: git: 953c1209f588 - main - databases/firebird40-*: Update to 4.0.5 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: acm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 953c1209f58826a57d6e7d50e738e139e27a3109 Auto-Submitted: auto-generated The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=953c1209f58826a57d6e7d50e738e139e27a3109 commit 953c1209f58826a57d6e7d50e738e139e27a3109 Author: Jose Alonso Cardenas Marquez AuthorDate: 2025-01-02 03:24:20 +0000 Commit: Jose Alonso Cardenas Marquez CommitDate: 2025-01-02 03:24:20 +0000 databases/firebird40-*: Update to 4.0.5 - Switch to c++17. It could fix some issues with new version of devel/icu [1] PR: 283543 Reported by: diizzy [1] --- databases/firebird40-server/Makefile | 6 ++--- databases/firebird40-server/distinfo | 6 ++--- .../files/patch-builds-posix-prefix.freebsd_amd64 | 19 +++++++++------ .../files/patch-builds_posix_make.defaults | 27 ++++++++++++++-------- databases/firebird40-server/files/patch-configure | 15 +++++++++--- 5 files changed, 48 insertions(+), 25 deletions(-) diff --git a/databases/firebird40-server/Makefile b/databases/firebird40-server/Makefile index 4b228bca2ee3..acb752aba5db 100644 --- a/databases/firebird40-server/Makefile +++ b/databases/firebird40-server/Makefile @@ -1,9 +1,9 @@ PORTNAME= firebird -PORTVERSION= 4.0.4 +PORTVERSION= 4.0.5 CATEGORIES?= databases MASTER_SITES= https://github.com/FirebirdSQL/${PORTNAME}/releases/download/v${PORTVERSION}/ PKGNAMESUFFIX?= ${PORTVERSION:R:S/.//}-server -DISTNAME= ${PORTNAME:S/f/F/}-${PORTVERSION}.3010-0 +DISTNAME= ${PORTNAME:S/f/F/}-${PORTVERSION}.3140-0 DIST_SUBDIR= ${PORTNAME} MAINTAINER= acm@FreeBSD.org @@ -26,7 +26,7 @@ LIB_DEPENDS= libicuuc.so:devel/icu \ CONFLICTS_INSTALL= firebird30 USES= cpe gmake pkgconfig localbase:ldflags libedit tar:xz -USE_CXXSTD= c++11 +USE_CXXSTD= c++17 GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes CPE_VENDOR= firebirdsql diff --git a/databases/firebird40-server/distinfo b/databases/firebird40-server/distinfo index 802b94a3def2..efeb2819e43f 100644 --- a/databases/firebird40-server/distinfo +++ b/databases/firebird40-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1705444780 -SHA256 (firebird/Firebird-4.0.4.3010-0.tar.xz) = 9ae13f9a1b5e9a36acfdd27b0dcd57b29d8d161f4f0199b18c6b8a183e9d4a75 -SIZE (firebird/Firebird-4.0.4.3010-0.tar.xz) = 30691012 +TIMESTAMP = 1735770794 +SHA256 (firebird/Firebird-4.0.5.3140-0.tar.xz) = 5c2709070d90e179d57ba8205bcebce852890bc2750e88eba560b68bd1e955ea +SIZE (firebird/Firebird-4.0.5.3140-0.tar.xz) = 30722288 diff --git a/databases/firebird40-server/files/patch-builds-posix-prefix.freebsd_amd64 b/databases/firebird40-server/files/patch-builds-posix-prefix.freebsd_amd64 index dd0f1ae39223..c254744f8e54 100644 --- a/databases/firebird40-server/files/patch-builds-posix-prefix.freebsd_amd64 +++ b/databases/firebird40-server/files/patch-builds-posix-prefix.freebsd_amd64 @@ -1,19 +1,24 @@ ---- builds/posix/prefix.freebsd_amd64.orig 2020-10-20 08:40:05 UTC -+++ builds/posix/prefix.freebsd_amd64 -@@ -20,5 +20,13 @@ +--- builds/posix/prefix.freebsd_amd64 2024-08-08 01:59:40.000000000 -0700 ++++ builds/posix/prefix.freebsd_amd64 2025-01-01 17:05:51.322698000 -0800 +@@ -20,10 +20,18 @@ - EXE_LINK_OPTIONS+=-Wl,-rpath,../gen/firebird/lib + EXE_LINK_OPTIONS := $(LDFLAGS) $(THR_FLAGS) $(UNDEF_FLAGS) $(LIB_PATH_OPTS) -Wl,-rpath,../gen/firebird/lib -PROD_FLAGS=-O -fno-builtin -DFREEBSD -DAMD64 -pipe -MMD -fPIC -DEV_FLAGS=-ggdb -DFREEBSD -DAMD64 -pipe -MMD -p -fPIC -Wall -Wno-non-virtual-dtor +COMMON_FLAGS=-DFREEBSD -DAMD64 -pipe -MMD -fPIC +PROD_FLAGS=$(COMMON_FLAGS) -O0 -g -fno-builtin -Wno-deprecated +DEV_FLAGS=$(COMMON_FLAGS) -ggdb -p -Wall -Wno-non-virtual-dtor -+ -+# This file must be compiled with SSE4.2 support + + # This file must be compiled with SSE4.2 support +%/CRC32C.o: COMMON_FLAGS += -msse4 + +# These files are generated incorrectly (e.g. array.epp => array.cpp) +%/array.o %/blob.o %/alice_meta.o %/restore.o %/backup.o: COMMON_FLAGS += -Wno-narrowing +%/OdsDetection.o %/dba.o: COMMON_FLAGS += -Wno-narrowing - ++ ++# This file must be compiled with SSE4.2 support + %/CRC32C.o: CXXFLAGS += -msse4 + +-CXXFLAGS := $(CXXFLAGS) -std=c++11 ++CXXFLAGS := $(CXXFLAGS) -std=c++17 diff --git a/databases/firebird40-server/files/patch-builds_posix_make.defaults b/databases/firebird40-server/files/patch-builds_posix_make.defaults index 2959d2fa028d..cff567b5a5f4 100644 --- a/databases/firebird40-server/files/patch-builds_posix_make.defaults +++ b/databases/firebird40-server/files/patch-builds_posix_make.defaults @@ -1,7 +1,16 @@ ---- builds/posix/make.defaults 2020-10-20 03:40:05.000000000 -0500 -+++ builds/posix/make.defaults 2021-06-25 00:23:49.718147000 -0500 -@@ -134,7 +134,7 @@ - MATHLIB=@MATHLIB@ +--- builds/posix/make.defaults 2024-08-08 01:59:40.000000000 -0700 ++++ builds/posix/make.defaults 2025-01-01 15:53:58.882687000 -0800 +@@ -104,7 +104,7 @@ + #____________________________________________________________________________ + + # Global c++ flags: firebird needs no RTTI, choose build standard +-PLUSPLUS_FLAGS:= -fno-rtti -std=c++11 ++PLUSPLUS_FLAGS:= -fno-rtti -std=c++17 + + # If this is defined then we use special rules useful for developers only + IsDeveloper = @DEVEL_FLG@ +@@ -155,7 +155,7 @@ + endif # switch to make sed edit files inplace -INLINE_EDIT_SED:= -i @@ -9,7 +18,7 @@ # Default programs and tools to be used in the build process -@@ -144,7 +144,7 @@ +@@ -165,7 +165,7 @@ CHMOD= chmod CHMOD_6= chmod 666 CHMOD_7= chmod 777 @@ -18,7 +27,7 @@ MV= mv -f TOUCH= touch CP= cp -@@ -219,7 +219,7 @@ +@@ -241,7 +241,7 @@ #LibraryFileName=libfbclient LibraryFileName=libfbclient LibraryFullName=$(LibraryFileName).${SHRLIB_EXT}.${FirebirdVersion} @@ -27,7 +36,7 @@ LibraryBaseName=$(LibraryFileName).${SHRLIB_EXT} LIBFIREBIRD_FULLNAME = $(LIB)/$(LibraryFullName) -@@ -240,7 +240,7 @@ +@@ -262,7 +262,7 @@ ifeq ($(EDITLINE_FLG),Y) ifeq ($(STD_EDITLINE), true) @@ -36,7 +45,7 @@ else LIBEDITLINE := $(LIB)/libedit.a endif -@@ -362,7 +362,7 @@ +@@ -392,7 +392,7 @@ GDS_DROP = $(BIN)/gds_drop$(EXEC_EXT) FBSVCMGR = $(BIN)/fbsvcmgr$(EXEC_EXT) FBTRACEMGR = $(BIN)/fbtracemgr$(EXEC_EXT) @@ -45,7 +54,7 @@ NBACKUP = $(BIN)/nbackup$(EXEC_EXT) LOCKPRINT = $(BIN)/fb_lock_print$(EXEC_EXT) GSEC = $(BIN)/gsec$(EXEC_EXT) -@@ -383,13 +383,13 @@ +@@ -413,13 +413,13 @@ QLI = $(BIN)/qli$(EXEC_EXT) # From isql diff --git a/databases/firebird40-server/files/patch-configure b/databases/firebird40-server/files/patch-configure index 2cd41f32a632..4941763a01e6 100644 --- a/databases/firebird40-server/files/patch-configure +++ b/databases/firebird40-server/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2022-07-28 00:58:22 UTC -+++ configure -@@ -2985,6 +2985,20 @@ $as_echo "#define AMD64 1" >>confdefs.h +--- configure.orig 2024-08-08 02:10:59.000000000 -0700 ++++ configure 2025-01-01 16:50:16.531360000 -0800 +@@ -3096,6 +3096,20 @@ SHRLIB_EXT=so ;; @@ -21,3 +21,12 @@ *-gentoo-freebsd*) MAKEFILE_PREFIX=freebsd PLATFORM=GENTOOFREEBSD +@@ -19405,7 +19419,7 @@ + pre_save_restore_cxxflags=$CXXFLAGS + pre_save_restore_libs=$LIBS + +-CXXFLAGS="$CXXFLAGS -std=c++11" ++CXXFLAGS="$CXXFLAGS -std=c++17" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler understands noexcept" >&5 + $as_echo_n "checking whether the C++ compiler understands noexcept... " >&6; } + if ${ac_cv_cxx_noexcept+:} false; then :