Attachment #168019 for bug #207909

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




# $FreeBSD$

PORTNAME=	openlibm
PORTVERSION=	0.5.0
DISTVERSIONPREFIX=	v
CATEGORIES=	math
MASTER_SITES=	GH


MAKE_ENV+=	prefix=${PREFIX}

.if ${ARCH} == "amd64" || ${ARCH} == "i386"
PLIST_SUB+=	EXTRA_HEADER=""
.else
PLIST_SUB+=	EXTRA_HEADER="@comment "
.endif

TEST_TARGET=	check

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (JuliaLang-openlibm-v0.4.1_GH0.tar.gz) = d6269849348027b0a02ef5f7707968185017b4bb9607acd2fd7348ba28c69833	1	SHA256 (JuliaLang-openlibm-v0.5.0_GH0.tar.gz) = a9a03644b38fd611a63838f1924925bc27f756ee04f69a90e2af7594f34558b8
2	SIZE (JuliaLang-openlibm-v0.4.1_GH0.tar.gz) = 277924	2	SIZE (JuliaLang-openlibm-v0.5.0_GH0.tar.gz) = 352346




--- Make.inc.orig	2016-03-11 16:57:11 UTC
+++ Make.inc
@@ -3,11 +3,11 @@
 OS := $(shell uname)
 # Do not forget to bump SOMINOR when changing VERSION,
 # and SOMAJOR when breaking ABI in a backward-incompatible way
-VERSION = 0.5-dev
+VERSION = 0.5
 SOMAJOR = 2
 SOMINOR = 1
 DESTDIR =
-prefix = /usr/local
+prefix ?= /usr/local

 bindir = $(prefix)/bin
 libdir = $(prefix)/lib
 includedir = $(prefix)/include
 
+pkgconfigdir = $(libdir)/pkgconfig
+
+ifeq ($(OS), FreeBSD)
+pkgconfigdir = $(prefix)/libdata/pkgconfig
+endif
+
 USEGCC = 1
 USECLANG = 0
 
@@ -20,6 +26,11 @@ USEGCC = 0
 USECLANG = 1
 endif
 
+ifeq ($(OS), FreeBSD)
+USEGCC = 0
+USECLANG = 1
+endif
+
 AR = ar
 
 ifeq ($(USECLANG),1)
@@ -90,6 +101,7 @@ ifeq ($(OS), FreeBSD)
 SHLIB_EXT = so
 SONAME_FLAG = -soname
 CFLAGS_add+=-fPIC
+libdatadir = $(prefix)/libdata
 endif
 
 ifeq ($(OS), Darwin)




--- Makefile.orig	2016-03-08 10:28:02 UTC
+++ Makefile
@@ -66,8 +66,8 @@ install: all openlibm.pc
 	@-ln -sf libopenlibm.$(SHLIB_EXT).$(SOMAJOR).$(SOMINOR) libopenlibm.$(SHLIB_EXT)
 endif
 
+check test: test/test-double test/test-float
+	test/test-double
+	test/test-float
+
+test/test-double: libopenlibm.$(SHLIB_EXT)
+	$(MAKE) -C test test-double
+
+test/test-float: libopenlibm.$(SHLIB_EXT)
+	$(MAKE) -C test test-float
+
 clean:
 	@for dir in $(SUBDIRS) .; do \
 		rm -fr $$dir/*.o $$dir/*.a $$dir/*.$(SHLIB_EXT)*; \
@@ -53,15 +63,15 @@ openlibm.pc: openlibm.pc.in Make.inc Mak
 
 install: all openlibm.pc
 	mkdir -p $(DESTDIR)$(shlibdir)
 	mkdir -p $(DESTDIR)$(pkgconfigdir)
+	mkdir -p $(DESTDIR)$(pkgconfigdir)
 	mkdir -p $(DESTDIR)$(includedir)/openlibm
-	cp -f -a libopenlibm.$(SHLIB_EXT)* $(DESTDIR)$(shlibdir)/
-	cp -f -a libopenlibm.a $(DESTDIR)$(libdir)/
-	cp -f -a include/*.h $(DESTDIR)$(includedir)/openlibm
-	cp -f -a src/*.h $(DESTDIR)$(includedir)/openlibm
-	cp -f -a openlibm.pc $(DESTDIR)$(pkgconfigdir)/
+	${BSD_INSTALL_LIB} libopenlibm.$(SHLIB_EXT)* $(DESTDIR)$(shlibdir)/
+	${BSD_INSTALL_DATA} libopenlibm.a $(DESTDIR)$(libdir)/
+	${BSD_INSTALL_DATA} include/*.h $(DESTDIR)$(includedir)/openlibm
+	${BSD_INSTALL_DATA} src/*.h $(DESTDIR)$(includedir)/openlibm
+	${BSD_INSTALL_DATA} openlibm.pc $(DESTDIR)$(pkgconfigdir)/
 ifneq ($(wildcard $(ARCH)/bsd_asm.h),)
-	cp -a $(ARCH)/bsd_asm.h $(DESTDIR)$(includedir)/openlibm/
+	${BSD_INSTALL_DATA} $(ARCH)/bsd_asm.h $(DESTDIR)$(includedir)/openlibm/
 endif
 ifneq ($(wildcard $(ARCH)/bsd_cdefs.h),)
-	cp -a $(ARCH)/bsd_cdefs.h $(DESTDIR)$(includedir)/openlibm/
+	${BSD_INSTALL_DATA} $(ARCH)/bsd_cdefs.h $(DESTDIR)$(includedir)/openlibm/
 endif




@comment $FreeBSD$
include/openlibm/aarch64_fpmath.h
include/openlibm/amd64_fpmath.h
include/openlibm/bsd_cdefs.h
include/openlibm/cdefs-compat.h
include/openlibm/fpmath.h
include/openlibm/i386_fpmath.h
include/openlibm/k_log.h
include/openlibm/k_logf.h
include/openlibm/math_private.h
include/openlibm/math_private_openbsd.h
include/openlibm/openlibm.h
include/openlibm/openlibm_complex.h
include/openlibm/openlibm_fenv.h
include/openlibm/openlibm_fenv_amd64.h
include/openlibm/openlibm_fenv_arm.h
include/openlibm/openlibm_fenv_i387.h
include/openlibm/openlibm_fenv_powerpc.h
include/openlibm/openlibm_math.h
include/openlibm/powerpc_fpmath.h
include/openlibm/types-compat.h
lib/libopenlibm.a
lib/libopenlibm.so
lib/libopenlibm.so.2
lib/libopenlibm.so.2.1
libdata/pkgconfig/openlibm.pc

Return to bug 207909

Lines 2-8 Link Here

(-)Makefile (-7 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= openlibm	4	PORTNAME= openlibm
5	PORTVERSION= 0.4.1	5	PORTVERSION= 0.5.0
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	CATEGORIES= math	7	CATEGORIES= math
8	MASTER_SITES= GH	8	MASTER_SITES= GH
Lines 25-36 Link Here
25		25
26	MAKE_ENV+= prefix=${PREFIX}	26	MAKE_ENV+= prefix=${PREFIX}
27		27
28	.if ${ARCH} == "amd64" \|\| ${ARCH} == "i386"
29	PLIST_SUB+= EXTRA_HEADER=""
30	.else
31	PLIST_SUB+= EXTRA_HEADER="@comment "
32	.endif
33
34	TEST_TARGET= check	28	TEST_TARGET= check
35		29
36	.include <bsd.port.post.mk>	30	.include <bsd.port.post.mk>

Lines 1-8 Link Here

(-)files/patch-Make.inc (-34 / +9 lines)
1	--- Make.inc.orig 2014-12-01 13:10:35 UTC	1	--- Make.inc.orig 2016-03-11 16:57:11 UTC
2	+++ Make.inc	2	+++ Make.inc
3	@@ -7,11 +7,17 @@ VERSION = 0.4	3	@@ -3,11 +3,11 @@
4	SOMAJOR = 1	4	OS := $(shell uname)
5	SOMINOR = 0	5	# Do not forget to bump SOMINOR when changing VERSION,
		6	# and SOMAJOR when breaking ABI in a backward-incompatible way
		7	-VERSION = 0.5-dev
		8	+VERSION = 0.5
		9	SOMAJOR = 2
		10	SOMINOR = 1
6	DESTDIR =	11	DESTDIR =
7	-prefix = /usr/local	12	-prefix = /usr/local
8	+prefix ?= /usr/local	13	+prefix ?= /usr/local
Lines 9-41 Link Here
9	bindir = $(prefix)/bin	14	bindir = $(prefix)/bin
10	libdir = $(prefix)/lib	15	libdir = $(prefix)/lib
11	includedir = $(prefix)/include	16	includedir = $(prefix)/include
12
13	+pkgconfigdir = $(libdir)/pkgconfig
14	+
15	+ifeq ($(OS), FreeBSD)
16	+pkgconfigdir = $(prefix)/libdata/pkgconfig
17	+endif
18	+
19	USEGCC = 1
20	USECLANG = 0
21
22	@@ -20,6 +26,11 @@ USEGCC = 0
23	USECLANG = 1
24	endif
25
26	+ifeq ($(OS), FreeBSD)
27	+USEGCC = 0
28	+USECLANG = 1
29	+endif
30	+
31	AR = ar
32
33	ifeq ($(USECLANG),1)
34	@@ -90,6 +101,7 @@ ifeq ($(OS), FreeBSD)
35	SHLIB_EXT = so
36	SONAME_FLAG = -soname
37	CFLAGS_add+=-fPIC
38	+libdatadir = $(prefix)/libdata
39	endif
40
41	ifeq ($(OS), Darwin)

Lines 1-42 Link Here

(-)files/patch-Makefile (-36 / +10 lines)
1	--- Makefile.orig 2014-12-01 13:10:35 UTC	1	--- Makefile.orig 2016-03-08 10:28:02 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -37,6 +37,16 @@ else	3	@@ -66,8 +66,8 @@ install: all openlibm.pc
4	@-ln -sf libopenlibm.$(SHLIB_EXT).$(SOMAJOR).$(SOMINOR) libopenlibm.$(SHLIB_EXT)
5	endif
6
7	+check test: test/test-double test/test-float
8	+ test/test-double
9	+ test/test-float
10	+
11	+test/test-double: libopenlibm.$(SHLIB_EXT)
12	+ $(MAKE) -C test test-double
13	+
14	+test/test-float: libopenlibm.$(SHLIB_EXT)
15	+ $(MAKE) -C test test-float
16	+
17	clean:
18	@for dir in $(SUBDIRS) .; do \
19	rm -fr $$dir/.o $$dir/.a $$dir/.$(SHLIB_EXT); \
20	@@ -53,15 +63,15 @@ openlibm.pc: openlibm.pc.in Make.inc Mak
21
22	install: all openlibm.pc
23	mkdir -p $(DESTDIR)$(shlibdir)	4	mkdir -p $(DESTDIR)$(shlibdir)
24	- mkdir -p $(DESTDIR)$(libdir)/pkgconfig	5	mkdir -p $(DESTDIR)$(pkgconfigdir)
25	+ mkdir -p $(DESTDIR)$(pkgconfigdir)
26	mkdir -p $(DESTDIR)$(includedir)/openlibm	6	mkdir -p $(DESTDIR)$(includedir)/openlibm
27	- cp -a libopenlibm.$(SHLIB_EXT)* $(DESTDIR)$(shlibdir)/	7	- cp -f -a libopenlibm.$(SHLIB_EXT)* $(DESTDIR)$(shlibdir)/
28	- cp -a libopenlibm.a $(DESTDIR)$(libdir)/	8	- cp -f -a libopenlibm.a $(DESTDIR)$(libdir)/
29	- cp -a src/openlibm.h $(DESTDIR)$(includedir)/	9	- cp -f -a include/*.h $(DESTDIR)$(includedir)/openlibm
30	- cp -a openlibm.pc $(DESTDIR)$(libdir)/pkgconfig/	10	- cp -f -a src/*.h $(DESTDIR)$(includedir)/openlibm
		11	- cp -f -a openlibm.pc $(DESTDIR)$(pkgconfigdir)/
31	+ ${BSD_INSTALL_LIB} libopenlibm.$(SHLIB_EXT)* $(DESTDIR)$(shlibdir)/	12	+ ${BSD_INSTALL_LIB} libopenlibm.$(SHLIB_EXT)* $(DESTDIR)$(shlibdir)/
32	+ ${BSD_INSTALL_DATA} libopenlibm.a $(DESTDIR)$(libdir)/	13	+ ${BSD_INSTALL_DATA} libopenlibm.a $(DESTDIR)$(libdir)/
33	+ ${BSD_INSTALL_DATA} src/openlibm.h $(DESTDIR)$(includedir)/	14	+ ${BSD_INSTALL_DATA} include/*.h $(DESTDIR)$(includedir)/openlibm
		15	+ ${BSD_INSTALL_DATA} src/*.h $(DESTDIR)$(includedir)/openlibm
34	+ ${BSD_INSTALL_DATA} openlibm.pc $(DESTDIR)$(pkgconfigdir)/	16	+ ${BSD_INSTALL_DATA} openlibm.pc $(DESTDIR)$(pkgconfigdir)/
35	ifneq ($(wildcard $(ARCH)/bsd_asm.h),)
36	- cp -a $(ARCH)/bsd_asm.h $(DESTDIR)$(includedir)/openlibm/
37	+ ${BSD_INSTALL_DATA} $(ARCH)/bsd_asm.h $(DESTDIR)$(includedir)/openlibm/
38	endif
39	ifneq ($(wildcard $(ARCH)/bsd_cdefs.h),)
40	- cp -a $(ARCH)/bsd_cdefs.h $(DESTDIR)$(includedir)/openlibm/
41	+ ${BSD_INSTALL_DATA} $(ARCH)/bsd_cdefs.h $(DESTDIR)$(includedir)/openlibm/
42	endif

Lines 1-9 Link Here

(-)pkg-plist (-5 / +22 lines)
1	@comment $FreeBSD$	1	@comment $FreeBSD$
2	include/openlibm.h	2	include/openlibm/aarch64_fpmath.h
3	%%EXTRA_HEADER%%include/openlibm/bsd_asm.h	3	include/openlibm/amd64_fpmath.h
4	%%EXTRA_HEADER%%include/openlibm/bsd_cdefs.h	4	include/openlibm/bsd_cdefs.h
		5	include/openlibm/cdefs-compat.h
		6	include/openlibm/fpmath.h
		7	include/openlibm/i386_fpmath.h
		8	include/openlibm/k_log.h
		9	include/openlibm/k_logf.h
		10	include/openlibm/math_private.h
		11	include/openlibm/math_private_openbsd.h
		12	include/openlibm/openlibm.h
		13	include/openlibm/openlibm_complex.h
		14	include/openlibm/openlibm_fenv.h
		15	include/openlibm/openlibm_fenv_amd64.h
		16	include/openlibm/openlibm_fenv_arm.h
		17	include/openlibm/openlibm_fenv_i387.h
		18	include/openlibm/openlibm_fenv_powerpc.h
		19	include/openlibm/openlibm_math.h
		20	include/openlibm/powerpc_fpmath.h
		21	include/openlibm/types-compat.h
5	lib/libopenlibm.a	22	lib/libopenlibm.a
6	lib/libopenlibm.so	23	lib/libopenlibm.so
7	lib/libopenlibm.so.1	24	lib/libopenlibm.so.2
8	lib/libopenlibm.so.1.0	25	lib/libopenlibm.so.2.1
9	libdata/pkgconfig/openlibm.pc	26	libdata/pkgconfig/openlibm.pc