Attachment #167101 for bug #207266

View | Details | Raw Unified | Return to bug 207266
Collapse All | Expand All




# $FreeBSD: head/math/libtommath/Makefile 401594 2015-11-14 20:27:12Z amdmi3 $

PORTNAME=	libtommath
PORTVERSION=	1.0
#PORTREVISION=	0
CATEGORIES=	math
MASTER_SITES=	https://github.com/libtom/libtommath/releases/download/v${PORTVERSION}/
DISTNAME=	ltm-${PORTVERSION}

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Comprehensive, modular, and portable mathematical routines

WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
USES=		gmake tar:xz
ALL_TARGET=	default
CFLAGS+=	-fPIC
PORTDOCS=	*

SHARED_DESC=	Build shared library
SHARED_USES=		libtool:build
SHARED_USE=		LDCONFIG=yes
SHARED_PLIST_FILES=	lib/libtommath.so lib/libtommath.so.1 lib/libtommath.so.1.0.0
SHARED_VARS=		MAKEFILE=makefile.shared
SHARED_VARS_OFF=	MAKEFILE=makefile

post-patch:
	${REINPLACE_CMD} -e 's|gcc|${CC}|g' ${WRKSRC}/makefile.shared
	${REINPLACE_CMD} -e 's|DESTDIR=|DESTDIR?=| ; s|-g $$(GROUP) -o $$(USER)||' ${WRKSRC}/${MAKEFILE}

post-install:
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/bn.pdf ${STAGEDIR}${DOCSDIR}

	${INSTALL_DATA} ${WRKSRC}/tommath.pdf ${STAGEDIR}${DOCSDIR}

post-install-SHARED-on:
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtommath.so.1

regression-test:
	(cd ${WRKSRC}; \

Lines 1-2 Link Here

(-)./distinfo (-2 / +2 lines)
1	SHA256 (ltm-0.42.0.tar.bz2) = 7b5c258304c34ac5901cfddb9f809b9b3b8ac7d04f700cf006ac766a923eb217	1	SHA256 (ltm-1.0.tar.xz) = 993a7df9ee091fca430cdde3263df57d88ef62af8103903214da49fc51bbb56c
2	SIZE (ltm-0.42.0.tar.bz2) = 1968961	2	SIZE (ltm-1.0.tar.xz) = 2191540




--- makefile.bak	2010-07-30 12:05:21.219322050 +0200
+++ makefile	2010-07-30 12:07:19.588144344 +0200
@@ -14,7 +14,7 @@
 ifndef IGNORE_SPEED
 
 #for speed 
-CFLAGS += -O3 -funroll-loops
+CFLAGS += -funroll-loops
 
 #for size 
 #CFLAGS += -Os
@@ -53,9 +53,9 @@
 #INCPATH-The directory to install the header files for libtommath.
 #DATAPATH-The directory to install the pdf docs.
 DESTDIR=
-LIBPATH=/usr/lib
-INCPATH=/usr/include
-DATAPATH=/usr/share/doc/libtommath/pdf
+LIBPATH=${PREFIX}/lib
+INCPATH=${PREFIX}/include
+DATAPATH=${DOCSDIR}/pdf
 
 OBJECTS=bncore.o bn_mp_init.o bn_mp_clear.o bn_mp_exch.o bn_mp_grow.o bn_mp_shrink.o \
 bn_mp_clamp.o bn_mp_zero.o  bn_mp_set.o bn_mp_set_int.o bn_mp_init_size.o bn_mp_copy.o \
--- makefile.shared.orig	2010-07-23 16:27:20.000000000 +0200
+++ makefile.shared	2013-04-18 15:26:25.000000000 +0200
@@ -10,7 +10,7 @@
 ifndef IGNORE_SPEED
 
 #for speed 
-CFLAGS += -O3 -funroll-loops
+CFLAGS += -funroll-loops
 
 #for size 
 #CFLAGS += -Os
@@ -48,9 +48,9 @@
 #INCPATH-The directory to install the header files for libtommath.
 #DATAPATH-The directory to install the pdf docs.
 DESTDIR=
-LIBPATH=/usr/lib
-INCPATH=/usr/include
-DATAPATH=/usr/share/doc/libtommath/pdf
+LIBPATH=${PREFIX}/lib
+INCPATH=${PREFIX}/include
+DATAPATH=${DOCSDIR}/pdf
 
 OBJECTS=bncore.o bn_mp_init.o bn_mp_clear.o bn_mp_exch.o bn_mp_grow.o bn_mp_shrink.o \
 bn_mp_clamp.o bn_mp_zero.o  bn_mp_set.o bn_mp_set_int.o bn_mp_init_size.o bn_mp_copy.o \
@@ -93,7 +93,7 @@
 
 test: $(LIBNAME) demo/demo.o
 	gcc $(CFLAGS) -c demo/demo.c -o demo/demo.o
-	libtool --mode=link gcc -o test demo/demo.o $(LIBNAME_S)
+	libtool --mode=link gcc -o test demo/demo.o .libs/$(LIBNAME_S)
 	
 mtest: test	
 	cd mtest ; gcc $(CFLAGS) mtest.c -o mtest




--- makefile.include.orig	2016-02-03 18:07:27 UTC
+++ makefile.include
@@ -14,15 +14,15 @@ ifndef PREFIX
   PREFIX=
 endif
 
-ifeq ($(CC),cc)
-  CC = $(PREFIX)gcc
-endif
-LD=$(PREFIX)ld
-AR=$(PREFIX)ar
-RANLIB=$(PREFIX)ranlib
+#ifeq ($(CC),cc)
+#  CC = $(PREFIX)gcc
+#endif
+#LD=$(PREFIX)ld
+AR=$(shell which ar)
+RANLIB=$(shell which ranlib)
 
 ifndef MAKE
-   MAKE=make
+   MAKE=$(shell which gmake)
 endif
 
 CFLAGS += -I./ -Wall -Wsign-compare -Wextra -Wshadow
@@ -55,7 +55,7 @@ endif # COMPILE_SIZE
 endif # COMPILE_DEBUG
 
 # adjust coverage set
-ifneq ($(filter $(shell arch), i386 i686 x86_64 amd64 ia64),)
+ifneq ($(filter $(shell /sbin/sysctl -b hw.machine_arch), i386 i686 x86_64 amd64 ia64),)
    COVERAGE = test_standalone timing
    COVERAGE_APP = ./test && ./ltmtest
 else
@@ -71,9 +71,9 @@ test_standalone: CFLAGS+=-DLTM_DEMO_TEST
 #LIBPATH-The directory for libtommath to be installed to.
 #INCPATH-The directory to install the header files for libtommath.
 #DATAPATH-The directory to install the pdf docs.
-LIBPATH?=/usr/lib
-INCPATH?=/usr/include
-DATAPATH?=/usr/share/doc/libtommath/pdf
+LIBPATH?=$(PREFIX)/lib
+INCPATH?=$(PREFIX)/include
+DATAPATH?=$(DOCSDIR)/pdf
 
 #make the code coverage of the library
 #

Return to bug 207266

Lines 1-17 Link Here

(-)./Makefile (-10 / +6 lines)
1	# $FreeBSD: head/math/libtommath/Makefile 401594 2015-11-14 20:27:12Z amdmi3 $	1	# $FreeBSD: head/math/libtommath/Makefile 401594 2015-11-14 20:27:12Z amdmi3 $
2		2
3	PORTNAME= libtommath	3	PORTNAME= libtommath
4	PORTVERSION= 0.42.0	4	PORTVERSION= 1.0
5	PORTREVISION= 2	5	#PORTREVISION= 0
6	CATEGORIES= math	6	CATEGORIES= math
7	MASTER_SITES= http://libtom.net/files/	7	MASTER_SITES= https://github.com/libtom/libtommath/releases/download/v${PORTVERSION}/
8	DISTNAME= ltm-${PORTVERSION}	8	DISTNAME= ltm-${PORTVERSION}
9		9
10	MAINTAINER= ports@FreeBSD.org	10	MAINTAINER= ports@FreeBSD.org
11	COMMENT= Comprehensive, modular, and portable mathematical routines	11	COMMENT= Comprehensive, modular, and portable mathematical routines
12		12
13	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}	13	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
14	USES= gmake tar:bzip2	14	USES= gmake tar:xz
15	ALL_TARGET= default	15	ALL_TARGET= default
16	CFLAGS+= -fPIC	16	CFLAGS+= -fPIC
17	PORTDOCS= *	17	PORTDOCS= *
Lines 24-37 OPTIONS_DEFINE= DOCS SHARED Link Here
24	SHARED_DESC= Build shared library	24	SHARED_DESC= Build shared library
25	SHARED_USES= libtool:build	25	SHARED_USES= libtool:build
26	SHARED_USE= LDCONFIG=yes	26	SHARED_USE= LDCONFIG=yes
27	SHARED_PLIST_FILES= lib/libtommath.so lib/libtommath.so.0 lib/libtommath.so.0.0.41	27	SHARED_PLIST_FILES= lib/libtommath.so lib/libtommath.so.1 lib/libtommath.so.1.0.0
28	SHARED_VARS= MAKEFILE=makefile.shared	28	SHARED_VARS= MAKEFILE=makefile.shared
29	SHARED_VARS_OFF= MAKEFILE=makefile	29	SHARED_VARS_OFF= MAKEFILE=makefile
30		30
31	post-patch:
32	${REINPLACE_CMD} -e 's\|gcc\|${CC}\|g' ${WRKSRC}/makefile.shared
33	${REINPLACE_CMD} -e 's\|DESTDIR=\|DESTDIR?=\| ; s\|-g $$(GROUP) -o $$(USER)\|\|' ${WRKSRC}/${MAKEFILE}
34
35	post-install:	31	post-install:
36	@${MKDIR} ${STAGEDIR}${DOCSDIR}	32	@${MKDIR} ${STAGEDIR}${DOCSDIR}
37	${INSTALL_DATA} ${WRKSRC}/bn.pdf ${STAGEDIR}${DOCSDIR}	33	${INSTALL_DATA} ${WRKSRC}/bn.pdf ${STAGEDIR}${DOCSDIR}
Lines 39-45 post-install: Link Here
39	${INSTALL_DATA} ${WRKSRC}/tommath.pdf ${STAGEDIR}${DOCSDIR}	35	${INSTALL_DATA} ${WRKSRC}/tommath.pdf ${STAGEDIR}${DOCSDIR}
40		36
41	post-install-SHARED-on:	37	post-install-SHARED-on:
42	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtommath.so.0	38	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtommath.so.1
43		39
44	regression-test:	40	regression-test:
45	(cd ${WRKSRC}; \	41	(cd ${WRKSRC}; \

Lines 1-57 Link Here

(-)./files/patch-makefile (-57 lines)
1	--- makefile.bak 2010-07-30 12:05:21.219322050 +0200
2	+++ makefile 2010-07-30 12:07:19.588144344 +0200
3	@@ -14,7 +14,7 @@
4	ifndef IGNORE_SPEED
5
6	#for speed
7	-CFLAGS += -O3 -funroll-loops
8	+CFLAGS += -funroll-loops
9
10	#for size
11	#CFLAGS += -Os
12	@@ -53,9 +53,9 @@
13	#INCPATH-The directory to install the header files for libtommath.
14	#DATAPATH-The directory to install the pdf docs.
15	DESTDIR=
16	-LIBPATH=/usr/lib
17	-INCPATH=/usr/include
18	-DATAPATH=/usr/share/doc/libtommath/pdf
19	+LIBPATH=${PREFIX}/lib
20	+INCPATH=${PREFIX}/include
21	+DATAPATH=${DOCSDIR}/pdf
22
23	OBJECTS=bncore.o bn_mp_init.o bn_mp_clear.o bn_mp_exch.o bn_mp_grow.o bn_mp_shrink.o \
24	bn_mp_clamp.o bn_mp_zero.o bn_mp_set.o bn_mp_set_int.o bn_mp_init_size.o bn_mp_copy.o \
25	--- makefile.shared.orig 2010-07-23 16:27:20.000000000 +0200
26	+++ makefile.shared 2013-04-18 15:26:25.000000000 +0200
27	@@ -10,7 +10,7 @@
28	ifndef IGNORE_SPEED
29
30	#for speed
31	-CFLAGS += -O3 -funroll-loops
32	+CFLAGS += -funroll-loops
33
34	#for size
35	#CFLAGS += -Os
36	@@ -48,9 +48,9 @@
37	#INCPATH-The directory to install the header files for libtommath.
38	#DATAPATH-The directory to install the pdf docs.
39	DESTDIR=
40	-LIBPATH=/usr/lib
41	-INCPATH=/usr/include
42	-DATAPATH=/usr/share/doc/libtommath/pdf
43	+LIBPATH=${PREFIX}/lib
44	+INCPATH=${PREFIX}/include
45	+DATAPATH=${DOCSDIR}/pdf
46
47	OBJECTS=bncore.o bn_mp_init.o bn_mp_clear.o bn_mp_exch.o bn_mp_grow.o bn_mp_shrink.o \
48	bn_mp_clamp.o bn_mp_zero.o bn_mp_set.o bn_mp_set_int.o bn_mp_init_size.o bn_mp_copy.o \
49	@@ -93,7 +93,7 @@
50
51	test: $(LIBNAME) demo/demo.o
52	gcc $(CFLAGS) -c demo/demo.c -o demo/demo.o
53	- libtool --mode=link gcc -o test demo/demo.o $(LIBNAME_S)
54	+ libtool --mode=link gcc -o test demo/demo.o .libs/$(LIBNAME_S)
55
56	mtest: test
57	cd mtest ; gcc $(CFLAGS) mtest.c -o mtest

Line 0 Link Here

(-)./files/patch-makefile.include (+47 lines)
	1	--- makefile.include.orig 2016-02-03 18:07:27 UTC
	2	+++ makefile.include
	3	@@ -14,15 +14,15 @@ ifndef PREFIX
	4	PREFIX=
	5	endif
	6
	7	-ifeq ($(CC),cc)
	8	- CC = $(PREFIX)gcc
	9	-endif
	10	-LD=$(PREFIX)ld
	11	-AR=$(PREFIX)ar
	12	-RANLIB=$(PREFIX)ranlib
	13	+#ifeq ($(CC),cc)
	14	+# CC = $(PREFIX)gcc
	15	+#endif
	16	+#LD=$(PREFIX)ld
	17	+AR=$(shell which ar)
	18	+RANLIB=$(shell which ranlib)
	19
	20	ifndef MAKE
	21	- MAKE=make
	22	+ MAKE=$(shell which gmake)
	23	endif
	24
	25	CFLAGS += -I./ -Wall -Wsign-compare -Wextra -Wshadow
	26	@@ -55,7 +55,7 @@ endif # COMPILE_SIZE
	27	endif # COMPILE_DEBUG
	28
	29	# adjust coverage set
	30	-ifneq ($(filter $(shell arch), i386 i686 x86_64 amd64 ia64),)
	31	+ifneq ($(filter $(shell /sbin/sysctl -b hw.machine_arch), i386 i686 x86_64 amd64 ia64),)
	32	COVERAGE = test_standalone timing
	33	COVERAGE_APP = ./test && ./ltmtest
	34	else
	35	@@ -71,9 +71,9 @@ test_standalone: CFLAGS+=-DLTM_DEMO_TEST
	36	#LIBPATH-The directory for libtommath to be installed to.
	37	#INCPATH-The directory to install the header files for libtommath.
	38	#DATAPATH-The directory to install the pdf docs.
	39	-LIBPATH?=/usr/lib
	40	-INCPATH?=/usr/include
	41	-DATAPATH?=/usr/share/doc/libtommath/pdf
	42	+LIBPATH?=$(PREFIX)/lib
	43	+INCPATH?=$(PREFIX)/include
	44	+DATAPATH?=$(DOCSDIR)/pdf
	45
	46	#make the code coverage of the library
	47	#