netbird/FreeBSD-ports
0
0
Fork 0
mirror of https://github.com/netbirdio/FreeBSD-ports.git synced 2026-05-22 18:42:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

*/*: Fix build with llvm16 on 13.2-STABLE

Browse Source 
As like as HEAD(14.0-RELEASE) llvm16 was merged in base for 13.2-STABLE
with the OSVERSION 1302507.

- Utilize USE_CXXSTD=c++14 or similar solution where applicable
- Update conditionals to addtionally check for OSVERSION greater than
  1302507 and less than 1400000

Approved by:	portmgr (blanket)
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Muhammad Moinur Rahman
2023-07-26 02:48:20 +02:00
parent dbe06d2da8
commit 95274bf4f9
190 changed files with 273 additions and 464 deletions
Download Patch File Download Diff File Expand all files Collapse all files
accessibility/caribou/Makefile
+1 -1
View File
@@ -38,7 +38,7 @@ GLIB_SCHEMAS= org.gnome.caribou.gschema.xml \
.include <bsd.port.options.mk>
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
CFLAGS+= -Wno-error=incompatible-function-pointer-types
.endif
archivers/dzip/Makefile
+1 -1
View File
@@ -26,7 +26,7 @@ OPTIONS_DEFINE= DOCS
.include <bsd.port.options.mk>
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
CFLAGS+= -Wno-error=incompatible-function-pointer-types
.endif
archivers/rubygem-bzip2-ruby/Makefile
+1 -1
View File
@@ -15,7 +15,7 @@ USES= gem
.include <bsd.port.options.mk>
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
CONFIGURE_ARGS+= --with-cflags="-Wno-error=incompatible-function-pointer-types"
.endif
audio/gstreamer1-plugins-sndio/Makefile
+1 -1
View File
@@ -21,7 +21,7 @@ PLIST_FILES= lib/gstreamer-1.0/libgstsndio.so
.include <bsd.port.options.mk>
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
CFLAGS+= -Wno-error=incompatible-function-pointer-types
.endif
audio/libaudiofile/Makefile
+2 -9
View File
@@ -16,20 +16,13 @@ LIB_DEPENDS= libFLAC.so:audio/flac
CONFLICTS= osalp-0.7.*
USES= cpe pathfix pkgconfig tar:xz libtool
USE_CXXSTD= c++14
CPE_PRODUCT= audiofile
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
.include <bsd.port.pre.mk>
post-patch:
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
@${REINPLACE_CMD} -e 's|std::unary_function|std::__unary_function|' \
${WRKSRC}/libaudiofile/modules/SimpleModule.h
.endif
post-install:
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libaudiofile.so.1
.include <bsd.port.post.mk>
.include <bsd.port.mk>
audio/libfishsound/Makefile
+1 -1
View File
@@ -31,7 +31,7 @@ DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen
.include <bsd.port.options.mk>
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
CFLAGS+= -Wno-error=incompatible-function-pointer-types
.endif
audio/libsidplay/Makefile
+1 -6
View File
@@ -12,6 +12,7 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
USES= autoreconf libtool tar:bz2
USE_CXXSTD= c++14
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
@@ -24,10 +25,4 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
CONFIGURE_ARGS_i386= --enable-optendian --enable-optfixpoint
.include <bsd.port.options.mk>
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
CPPFLAGS+= -Dregister=
.endif
.include <bsd.port.mk>
audio/mpdcon/Makefile
+1 -1
View File
@@ -20,7 +20,7 @@ USE_GNUSTEP= base gui back build
.include <bsd.port.options.mk>
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
CFLAGS+= -Wno-error=incompatible-function-pointer-types
.endif
audio/ocp/Makefile
+3 -3
View File
@@ -88,9 +88,9 @@ X11_PLIST_SUB_OFF= DESKTOP='@comment ' \
TIMIDITY_CFG= ${LOCALBASE}/share/timidity/timidity.cfg
.include <bsd.port.options.mk>
.include <bsd.port.pre.mk>
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
CFLAGS+= -Wno-error=incompatible-function-pointer-types
.endif
@@ -99,4 +99,4 @@ post-install:
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ocp/*.so
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ocp/autoload/*.so
.include <bsd.port.mk>
.include <bsd.port.post.mk>
audio/play/Makefile
+2 -3
View File
@@ -23,11 +23,10 @@ PLIST_FILES= bin/play man/ja/man1/play.1.gz
.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
CFLAGS+= -Wno-error=int-conversion
.endif
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
.if ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )
CFLAGS+= -Wno-error=incompatible-function-pointer-types
.endif
.endif
post-patch:
.for file in play_audio.c mixer_ctl.c encode_sun.c speed.c
audio/sidplayer/Makefile
+1 -6
View File
@@ -14,6 +14,7 @@ LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= sdl
USE_CXXSTD= c++14
USE_SDL= sdl
GNU_CONFIGURE= yes
@@ -21,12 +22,6 @@ OPTIONS_DEFINE= DOCS
OPTIONS_SUB= yes
SUB_FILES= pkg-message
.include <bsd.port.options.mk>
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
CPPFLAGS+= -Dregister=
.endif
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
audio/snack/Makefile
+1 -1
View File
@@ -37,7 +37,7 @@ VORBIS_ALL_TARGET= all libsnackogg.so
.include <bsd.port.options.mk>
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
CFLAGS+= -Wno-error=incompatible-function-pointer-types
.endif
biology/ncbi-toolkit/Makefile
+2 -3
View File
@@ -35,11 +35,10 @@ OPTIONS_DEFINE= DOCS
.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
CFLAGS+= -Wno-error=int-conversion
.endif
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
.if ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )
CFLAGS+= -Wno-error=incompatible-function-pointer-types
.endif
.endif
post-patch:
@${REINPLACE_CMD} -e \
biology/wise/Makefile
+2 -3
View File
@@ -49,11 +49,10 @@ DATAFILES= BLOSUM30.bla BLOSUM45.bla BLOSUM62.bla BLOSUM80.bla aa.rnd \
.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
CFLAGS+= -Wno-error=int-conversion
.endif
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
.if ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )
CFLAGS+= -Wno-error=incompatible-function-pointer-types
.endif
.endif
post-patch:
@${FIND} ${BUILD_WRKSRC} -name "makefile" | ${XARGS} \
cad/spice/Makefile
+1 -1
View File
@@ -55,7 +55,7 @@ DEV_HISIM2_LICENSE= HISIML
.include <bsd.port.options.mk>
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
CFLAGS+= -Wno-error=int-conversion
.endif
chinese/celvis/Makefile
+1 -1
View File
@@ -15,7 +15,7 @@ CFLAGS+= -Wno-error=return-type
.include <bsd.port.options.mk>
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
CFLAGS+= -Wno-error=incompatible-function-pointer-types
.endif
chinese/libime/Makefile
+3 -3
View File
@@ -36,10 +36,10 @@ OPENGRAM_LM_TAR= lm_sc.arpa-20220810.tar.xz
OPENGRAM_DICT_TAR= dict-20220810.tar.xz
TABLE_DICT_TAR= table.tar.gz
.include <bsd.port.options.mk>
.include <bsd.port.pre.mk>
post-patch:
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
@${REINPLACE_CMD} -e 's|std::binary_function|std::__binary_function|' \
${WRKSRC}/src/libime/core/kenlm/lm/trie_sort.hh \
${WRKSRC}/src/libime/core/kenlm/util/joint_sort.hh \
@@ -52,4 +52,4 @@ post-extract:
${CP} ${DISTDIR}/${DIST_SUBDIR}/${OPENGRAM_DICT_TAR} ${WRKSRC}/data
${CP} ${DISTDIR}/${DIST_SUBDIR}/${TABLE_DICT_TAR} ${WRKSRC}/data
.include <bsd.port.mk>
.include <bsd.port.post.mk>
comms/uird/Makefile
+1 -1
View File
@@ -21,7 +21,7 @@ OPTIONS_DEFINE= DOCS
.include <bsd.port.options.mk>
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
CFLAGS+= -Wno-error=incompatible-function-pointer-types
.endif
converters/cocot/Makefile
+1 -1
View File
@@ -26,7 +26,7 @@ DOCS_JA= ChangeLog.ja README.ja
.include <bsd.port.options.mk>
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
CFLAGS+= -Wno-error=incompatible-function-pointer-types
.endif
converters/wkhtmltopdf/Makefile
+3 -5
View File
@@ -78,11 +78,9 @@ post-patch:
${ECHO} 'LIBS+= -lcrypto' >>${WRKSRC}/src/pdf/pdf.pro
${MKDIR} ${WRKSRC}/build/app ${WRKSRC}/build/qt \
${WRKSRC}/build/wkhtmltox
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
${REINPLACE_CMD} -e "s|register int|int|g" \
${PATCH_WRKSRC}/src/corelib/kernel/qcore_unix_p.h
${REINPLACE_CMD} -e "s|register UWORD32|UWORD32|g" \
${PATCH_WRKSRC}/../qt-5db36ec/src/3rdparty/md5/md5.cpp
.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
@${FIND} ${PATCH_WRKSRC}/../qt-5db36ec -name "*.cpp" -o -name "*.h" | \
${XARGS} ${REINPLACE_CMD} -e 's|register ||g'
.endif

Some files were not shown because too many files have changed in this diff Show More