Date: Tue, 8 Jun 2021 14:00:40 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: ef466943cf8a - main - devel/omniORB: UNBREAK for 13.X and later Message-ID: <202106081400.158E0eqg010301@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=ef466943cf8a47872ebd649fb8335b10d15b5c9c commit ef466943cf8a47872ebd649fb8335b10d15b5c9c Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2021-06-08 13:59:17 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2021-06-08 14:00:33 +0000 devel/omniORB: UNBREAK for 13.X and later - Fixes devel/py-omniORB --- devel/omniORB/Makefile | 4 +--- devel/omniORB/files/patch-configure | 4 +++- devel/omniORB/files/patch-contrib_pkgconfig_GNUmakefile.in | 11 ----------- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/devel/omniORB/Makefile b/devel/omniORB/Makefile index 414fb365bea4..ecc16a8fab5f 100644 --- a/devel/omniORB/Makefile +++ b/devel/omniORB/Makefile @@ -10,8 +10,6 @@ COMMENT= Robust high performance CORBA ORB for C++ and Python LICENSE= GPLv2 -BROKEN_FreeBSD_13= posix.cc:605:15: error: no matching function for call to 'pthread_detach' -BROKEN_FreeBSD_14= posix.cc:605:15: error: no matching function for call to 'pthread_detach' BROKEN_SSL= openssl BROKEN_SSL_REASON_openssl= member access into incomplete type 'DH' (aka 'dh_st') @@ -39,7 +37,7 @@ SHEBANG_FILES= src/tool/omniidl/python/scripts/omniidlrun.py \ post-patch: @${REINPLACE_CMD} -e 's#-O2#${CFLAGS}#g' ${WRKSRC}/mk/beforeauto.mk.in - @${REINPLACE_CMD} -e 's#%%STAGEDIR%%%%PREFIX%%#${STAGEDIR}${PREFIX}#g' \ + @${REINPLACE_CMD} -e 's#$$(INSTALLLIBDIR)/pkgconfig#${STAGEDIR}${PREFIX}/libdata/pkgconfig#g' \ ${WRKSRC}/contrib/pkgconfig/GNUmakefile.in post-install: diff --git a/devel/omniORB/files/patch-configure b/devel/omniORB/files/patch-configure index bfe1f08d292a..c2c8adb5f70d 100644 --- a/devel/omniORB/files/patch-configure +++ b/devel/omniORB/files/patch-configure @@ -1,6 +1,6 @@ --- configure.orig 2020-04-04 14:09:52 UTC +++ configure -@@ -7574,12 +7574,17 @@ case "$host" in +@@ -7574,12 +7574,19 @@ 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";; @@ -21,6 +21,8 @@ + *-*-freebsd10.*) plat_name="FreeBSD"; plat_def="__freebsd__"; os_v="10";; + *-*-freebsd11.*) plat_name="FreeBSD"; plat_def="__freebsd__"; os_v="11";; + *-*-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";; *-*-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";; diff --git a/devel/omniORB/files/patch-contrib_pkgconfig_GNUmakefile.in b/devel/omniORB/files/patch-contrib_pkgconfig_GNUmakefile.in deleted file mode 100644 index cebb37383f0b..000000000000 --- a/devel/omniORB/files/patch-contrib_pkgconfig_GNUmakefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- contrib/pkgconfig/GNUmakefile.in.orig 2014-03-25 15:18:18 UTC -+++ contrib/pkgconfig/GNUmakefile.in -@@ -4,7 +4,7 @@ BASE_OMNI_TREE=@top_srcdir@ - VPATH=@srcdir@ - INSTALL=@INSTALL@ - --INSTALLDIR = $(INSTALLLIBDIR)/pkgconfig -+INSTALLDIR = %%STAGEDIR%%%%PREFIX%%/libdata/pkgconfig - - PKGFILES = omnithread3.pc omniORB4.pc omniDynamic4.pc \ - omniCOS4.pc omniCOSDynamic4.pc omniConnectionMgmt4.pc \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106081400.158E0eqg010301>