Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 4 Dec 2023 11:56:11 GMT
From:      Muhammad Moinur Rahman <bofh@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 8a6152584fb0 - main - devel/omniORB: Unbreak on FreeBSD 15
Message-ID:  <202312041156.3B4BuBgx043570@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=8a6152584fb07224aaf0b949b5811cd0b0dd81e1

commit 8a6152584fb07224aaf0b949b5811cd0b0dd81e1
Author:     Marcin Cieślak <saper@saper.info>
AuthorDate: 2023-12-04 09:57:23 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-12-04 11:56:01 +0000

    devel/omniORB: Unbreak on FreeBSD 15
    
    PR:             275434
---
 devel/omniORB/Makefile              |  2 --
 devel/omniORB/files/patch-configure | 11 +++++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/devel/omniORB/Makefile b/devel/omniORB/Makefile
index 52f38a0fe746..1c7af4982fe4 100644
--- a/devel/omniORB/Makefile
+++ b/devel/omniORB/Makefile
@@ -10,8 +10,6 @@ WWW=		http://omniorb.sourceforge.net/
 
 LICENSE=	GPLv2
 
-BROKEN_FreeBSD_15=	cannot convert 'pthread**' to 'pthread_t' {aka 'pthread*'}
-
 LIB_DEPENDS=	libzstd.so:archivers/zstd
 
 USES=		gmake pkgconfig python shebangfix ssl tar:bzip2
diff --git a/devel/omniORB/files/patch-configure b/devel/omniORB/files/patch-configure
index 08fd2b8ae603..c554d8b439a3 100644
--- a/devel/omniORB/files/patch-configure
+++ b/devel/omniORB/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2021-04-11 12:58:05 UTC
+--- configure.orig	2023-08-28 16:47:18 UTC
 +++ configure
-@@ -7670,12 +7670,19 @@ case "$host" in
+@@ -8544,12 +8544,20 @@ case "$host" in
    *-*-irix*)     plat_name="IRIX";     plat_def="__irix__";     os_v="6";;
    *-*-aix*)      plat_name="AIX";      plat_def="__aix__";      os_v="4";;
    *-*-darwin*)   plat_name="Darwin";   plat_def="__darwin__";   os_v="1";;
@@ -23,6 +23,13 @@
 +  *-*-freebsd12.*) plat_name="FreeBSD";  plat_def="__freebsd__";  os_v="12";;
 +  *-*-freebsd13.*) plat_name="FreeBSD";  plat_def="__freebsd__";  os_v="13";;
 +  *-*-freebsd14.*) plat_name="FreeBSD";  plat_def="__freebsd__";  os_v="14";;
++  *-*-freebsd15.*) plat_name="FreeBSD";  plat_def="__freebsd__";  os_v="15";;
    *-*-kfreebsd*) plat_name="kFreeBSD";  plat_def="__FreeBSD_kernel__";  os_v="6";;
    *-*-netbsd*)   plat_name="NetBSD";   plat_def="__netbsd__";   os_v="1";;
    *-*-openbsd*)  plat_name="OpenBSD";  plat_def="__openbsd__";  os_v="3";;
+@@ -9999,5 +10007,3 @@ fi
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+ printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+ fi
+-
+-



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202312041156.3B4BuBgx043570>