Attachment #249688 for bug #278155




PORTNAME=	libtommath
DISTVERSION=	1.3.0
CATEGORIES=	math
MASTER_SITES=	https://github.com/libtom/${PORTNAME}/releases/download/v${DISTVERSION}/
DISTNAME=	ltm-${DISTVERSION}

MAINTAINER=	gahr@FreeBSD.org

LICENSE=	UNLICENSE
LICENSE_FILE=	${WRKSRC}/LICENSE

USES=		cmake:testing pathfix tar:xz
USE_LDCONFIG=	yes

WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}

CMAKE_ON=	BUILD_SHARED_LIBS

OPTIONS_DEFINE=	LTO OPTIMIZED_CFLAGS

LTO_CMAKE_BOOL=	COMPILE_LTO

OPTIMIZED_CFLAGS_CFLAGS=	-O3 -funroll-loops -fomit-frame-pointer

.include <bsd.port.mk>




--- CMakeLists.txt.orig	2024-04-03 22:01:48 UTC
+++ CMakeLists.txt
@@ -36,16 +36,16 @@ option(BUILD_SHARED_LIBS "Build shared library and onl
 #-----------------------------------------------------------------------------
 # Add support for ccache if desired
 #-----------------------------------------------------------------------------
-find_program(CCACHE ccache)
+#find_program(CCACHE ccache)
 
-if(CCACHE)
-    option(ENABLE_CCACHE "Enable ccache." ON)
-endif()
+#if(CCACHE)
+#    option(ENABLE_CCACHE "Enable ccache." ON)
+#endif()
 
 # use ccache if installed
-if(CCACHE AND ENABLE_CCACHE)
-    set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE})
-endif()
+#if(CCACHE AND ENABLE_CCACHE)
+#    set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE})
+#endif()
 
 #-----------------------------------------------------------------------------
 # Compose CFLAGS
@@ -68,8 +68,8 @@ else()
     set(LTM_C_FLAGS -Wall -Wsign-compare -Wextra -Wshadow
                     -Wdeclaration-after-statement -Wbad-function-cast -Wcast-align
                     -Wstrict-prototypes -Wpointer-arith -Wsystem-headers)
-    set(CMAKE_C_FLAGS_DEBUG "-g3")
-    set(CMAKE_C_FLAGS_RELEASE "-O3 -funroll-loops -fomit-frame-pointer")
+#    set(CMAKE_C_FLAGS_DEBUG "-g3")
+#    set(CMAKE_C_FLAGS_RELEASE "-O3 -funroll-loops -fomit-frame-pointer")
     set(CMAKE_C_FLAGS_RELWITHDEBINFO "-g3 -O2")
     set(CMAKE_C_FLAGS_MINSIZEREL "-Os")
 endif()
@@ -78,7 +78,7 @@ if(CMAKE_C_COMPILER_ID MATCHES "(C|c?)lang")
 if(CMAKE_C_COMPILER_ID MATCHES "(C|c?)lang")
     list(APPEND LTM_C_FLAGS -Wno-typedef-redefinition -Wno-tautological-compare -Wno-builtin-requires-header)
     # Clang requires at least '-O1' for dead code elimination
-    set(CMAKE_C_FLAGS_DEBUG "-O1 ${CMAKE_C_FLAGS_DEBUG}")
+#    set(CMAKE_C_FLAGS_DEBUG "-O1 ${CMAKE_C_FLAGS_DEBUG}")
 endif()
 if(CMAKE_C_COMPILER MATCHES "mingw")
     list(APPEND LTM_C_FLAGS -Wno-shadow -Wno-expansion-to-defined -Wno-declaration-after-statement -Wno-bad-function-cast)

Lines 2-8 include/tommath.h Link Here

(-)b/math/libtommath/pkg-plist (-1 lines)
2	lib/cmake/libtommath/libtommath-config-%%CMAKE_BUILD_TYPE%%.cmake	2	lib/cmake/libtommath/libtommath-config-%%CMAKE_BUILD_TYPE%%.cmake
3	lib/cmake/libtommath/libtommath-config-version.cmake	3	lib/cmake/libtommath/libtommath-config-version.cmake
4	lib/cmake/libtommath/libtommath-config.cmake	4	lib/cmake/libtommath/libtommath-config.cmake
5	lib/libtommath.a
6	lib/libtommath.so	5	lib/libtommath.so
7	lib/libtommath.so.1	6	lib/libtommath.so.1
8	lib/libtommath.so.1.3.0	7	lib/libtommath.so.1.3.0

Return to bug 278155

Lines 1-7 Link Here

(-)b/math/libtommath/Makefile (-5 / +11 lines)
1	PORTNAME= libtommath	1	PORTNAME= libtommath
2	DISTVERSION= 1.3.0	2	DISTVERSION= 1.3.0
3	CATEGORIES= math	3	CATEGORIES= math
4	MASTER_SITES= https://github.com/libtom/libtommath/releases/download/v${DISTVERSION}/	4	MASTER_SITES= https://github.com/libtom/${PORTNAME}/releases/download/v${DISTVERSION}/
5	DISTNAME= ltm-${DISTVERSION}	5	DISTNAME= ltm-${DISTVERSION}
6		6
7	MAINTAINER= gahr@FreeBSD.org	7	MAINTAINER= gahr@FreeBSD.org
Lines 11-21 WWW= https://libtom.net/ Link Here
11	LICENSE= UNLICENSE	11	LICENSE= UNLICENSE
12	LICENSE_FILE= ${WRKSRC}/LICENSE	12	LICENSE_FILE= ${WRKSRC}/LICENSE
13		13
14	USES= cmake:testing tar:xz	14	USES= cmake:testing pathfix tar:xz
15	CMAKE_ARGS= -DBUILD_TESTING:BOOL=ON \	15	USE_LDCONFIG= yes
16	-DCMAKE_INSTALL_PKGCONFIGDIR:STRING=libdata/pkgconfig	16
17	WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}	17	WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
18		18
19	USE_LDCONFIG= yes	19	CMAKE_ON= BUILD_SHARED_LIBS
		20
		21	OPTIONS_DEFINE= LTO OPTIMIZED_CFLAGS
		22
		23	LTO_CMAKE_BOOL= COMPILE_LTO
		24
		25	OPTIMIZED_CFLAGS_CFLAGS= -O3 -funroll-loops -fomit-frame-pointer
20		26
21	.include <bsd.port.mk>	27	.include <bsd.port.mk>

Added Link Here

(-)b/math/libtommath/files/patch-CMakeLists.txt (+46 lines)
1	--- CMakeLists.txt.orig 2024-04-03 22:01:48 UTC
2	+++ CMakeLists.txt
3	@@ -36,16 +36,16 @@ option(BUILD_SHARED_LIBS "Build shared library and onl
4	#-----------------------------------------------------------------------------
5	# Add support for ccache if desired
6	#-----------------------------------------------------------------------------
7	-find_program(CCACHE ccache)
8	+#find_program(CCACHE ccache)
9
10	-if(CCACHE)
11	- option(ENABLE_CCACHE "Enable ccache." ON)
12	-endif()
13	+#if(CCACHE)
14	+# option(ENABLE_CCACHE "Enable ccache." ON)
15	+#endif()
16
17	# use ccache if installed
18	-if(CCACHE AND ENABLE_CCACHE)
19	- set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE})
20	-endif()
21	+#if(CCACHE AND ENABLE_CCACHE)
22	+# set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE})
23	+#endif()
24
25	#-----------------------------------------------------------------------------
26	# Compose CFLAGS
27	@@ -68,8 +68,8 @@ else()
28	set(LTM_C_FLAGS -Wall -Wsign-compare -Wextra -Wshadow
29	-Wdeclaration-after-statement -Wbad-function-cast -Wcast-align
30	-Wstrict-prototypes -Wpointer-arith -Wsystem-headers)
31	- set(CMAKE_C_FLAGS_DEBUG "-g3")
32	- set(CMAKE_C_FLAGS_RELEASE "-O3 -funroll-loops -fomit-frame-pointer")
33	+# set(CMAKE_C_FLAGS_DEBUG "-g3")
34	+# set(CMAKE_C_FLAGS_RELEASE "-O3 -funroll-loops -fomit-frame-pointer")
35	set(CMAKE_C_FLAGS_RELWITHDEBINFO "-g3 -O2")
36	set(CMAKE_C_FLAGS_MINSIZEREL "-Os")
37	endif()
38	@@ -78,7 +78,7 @@ if(CMAKE_C_COMPILER_ID MATCHES "(C\|c?)lang")
39	if(CMAKE_C_COMPILER_ID MATCHES "(C\|c?)lang")
40	list(APPEND LTM_C_FLAGS -Wno-typedef-redefinition -Wno-tautological-compare -Wno-builtin-requires-header)
41	# Clang requires at least '-O1' for dead code elimination
42	- set(CMAKE_C_FLAGS_DEBUG "-O1 ${CMAKE_C_FLAGS_DEBUG}")
43	+# set(CMAKE_C_FLAGS_DEBUG "-O1 ${CMAKE_C_FLAGS_DEBUG}")
44	endif()
45	if(CMAKE_C_COMPILER MATCHES "mingw")
46	list(APPEND LTM_C_FLAGS -Wno-shadow -Wno-expansion-to-defined -Wno-declaration-after-statement -Wno-bad-function-cast)