View | Details | Raw Unified | Return to bug 154742 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-4 / +12 lines)
Lines 31-40 Link Here
31
31
32
LATEST_LINK=	py-${PORTNAME}
32
LATEST_LINK=	py-${PORTNAME}
33
WRKSRC=	${WRKDIR}/${DISTNAME:S/r/rc/}
33
WRKSRC=	${WRKDIR}/${DISTNAME:S/r/rc/}
34
MAKE_ENV+=	LDSHARED="${CC} -shared"
34
35
35
.include <bsd.port.pre.mk>
36
.include <bsd.port.pre.mk>
36
37
37
.if ((${OSVERSION} <= 800502) || (${OSVERSION} >= 900000 && ${OSVERSION} <= 900009)) && (${ARCH} == "i386" || ${ARCH} == "amd64")
38
.if ( ${OSVERSION} <= 703100 || \
39
( ${OSVERSION} >= 800000 && ${OSVERSION} <= 800502 ) || \
40
( ${OSVERSION} >= 900000 && ${OSVERSION} <= 900009 )) && \
41
( ${ARCH} == "i386" || ${ARCH} == "amd64" )
42
FIX_FENV=	yes
43
.endif
44
45
.if defined(FIX_FENV)
38
MASTER_SITES+=	http://svn.freebsd.org/base/head/lib/msun/:fp
46
MASTER_SITES+=	http://svn.freebsd.org/base/head/lib/msun/:fp
39
.if ${ARCH} == "i386"
47
.if ${ARCH} == "i386"
40
FP_ARCH=	i387
48
FP_ARCH=	i387
Lines 71-77 Link Here
71
79
72
GCCLIBDIR_CMDS=	${FC} -print-file-name=libgfortran.so|${SED} -e s/libgfortran.so//
80
GCCLIBDIR_CMDS=	${FC} -print-file-name=libgfortran.so|${SED} -e s/libgfortran.so//
73
pre-configure:
81
pre-configure:
74
.if ((${OSVERSION} <= 800502) || (${OSVERSION} >= 900000 && ${OSVERSION} <= 900009)) && (${ARCH} == "i386" || ${ARCH} == "amd64")
82
.if defined(FIX_FENV)
75
	@if [ "`${PKG_VERSION} -t \"\`\\\`${CC} -print-prog-name=as\\\` --version | ${AWK} 'NR==1 {sub(/\(GNU Binutils\)/,""); print $$3}'\`\" 2.18.49`" = ">" ] ; then \
83
	@if [ "`${PKG_VERSION} -t \"\`\\\`${CC} -print-prog-name=as\\\` --version | ${AWK} 'NR==1 {sub(/\(GNU Binutils\)/,""); print $$3}'\`\" 2.18.49`" = ">" ] ; then \
76
		${CP} ${DISTDIR}/${FP_ARCH}/fenv.c?p=203441 ${WRKSRC}/numpy/core/include/numpy/fenv/fenv.c; \
84
		${CP} ${DISTDIR}/${FP_ARCH}/fenv.c?p=203441 ${WRKSRC}/numpy/core/include/numpy/fenv/fenv.c; \
77
		${CP} ${DISTDIR}/${FP_ARCH}/fenv.h?p=203441 ${WRKSRC}/numpy/core/include/numpy/fenv/fenv.h; \
85
		${CP} ${DISTDIR}/${FP_ARCH}/fenv.h?p=203441 ${WRKSRC}/numpy/core/include/numpy/fenv/fenv.h; \
Lines 93-99 Link Here
93
	@${REINPLACE_CMD} -e "s+%%GCCLIBDIR%%+$$(${GCCLIBDIR_CMDS})+" ${WRKSRC}/numpy/distutils/system_info.py
101
	@${REINPLACE_CMD} -e "s+%%GCCLIBDIR%%+$$(${GCCLIBDIR_CMDS})+" ${WRKSRC}/numpy/distutils/system_info.py
94
102
95
pre-install:
103
pre-install:
96
.if ((${OSVERSION} <= 800502) || (${OSVERSION} >= 900000 && ${OSVERSION} <= 900009)) && (${ARCH} == "i386" || ${ARCH} == "amd64")
104
.if defined(FIX_FENV)
97
	@if [ "`${PKG_VERSION} -t \"\`\\\`${CC} -print-prog-name=as\\\` --version | ${AWK} 'NR==1 {sub(/\(GNU Binutils\)/,""); print $$3}'\`\" 2.18.49`" = ">" ] ; then \
105
	@if [ "`${PKG_VERSION} -t \"\`\\\`${CC} -print-prog-name=as\\\` --version | ${AWK} 'NR==1 {sub(/\(GNU Binutils\)/,""); print $$3}'\`\" 2.18.49`" = ">" ] ; then \
98
		${RM} ${WRKSRC}/numpy/core/include/numpy/fenv/fenv.c.bak; \
106
		${RM} ${WRKSRC}/numpy/core/include/numpy/fenv/fenv.c.bak; \
99
	fi
107
	fi
Lines 106-112 Link Here
106
	${INSTALL_DATA} ${WRKDIR}/numpy-ref.pdf ${DOCSDIR}
114
	${INSTALL_DATA} ${WRKDIR}/numpy-ref.pdf ${DOCSDIR}
107
	${INSTALL_DATA} ${WRKDIR}/numpy-user.pdf ${DOCSDIR}
115
	${INSTALL_DATA} ${WRKDIR}/numpy-user.pdf ${DOCSDIR}
108
.endif
116
.endif
109
.if ((${OSVERSION} <= 800502) || (${OSVERSION} >= 900000 && ${OSVERSION} <= 900009)) && (${ARCH} == "i386" || ${ARCH} == "amd64")
117
.if defined(FIX_FENV)
110
	@if [ "`${PKG_VERSION} -t \"\`\\\`${CC} -print-prog-name=as\\\` --version | ${AWK} 'NR==1 {sub(/\(GNU Binutils\)/,""); print $$3}'\`\" 2.18.49`" = ">" ] ; then \
118
	@if [ "`${PKG_VERSION} -t \"\`\\\`${CC} -print-prog-name=as\\\` --version | ${AWK} 'NR==1 {sub(/\(GNU Binutils\)/,""); print $$3}'\`\" 2.18.49`" = ">" ] ; then \
111
		${REINPLACE_CMD} -e "s|%%FENV%%||g" ${TMPPLIST}; \
119
		${REINPLACE_CMD} -e "s|%%FENV%%||g" ${TMPPLIST}; \
112
	else \
120
	else \
(-)distinfo (-7 lines)
Lines 1-21 Link Here
1
MD5 (numpy-1.5.1.tar.gz) = 376ef150df41b5353944ab742145352d
2
SHA256 (numpy-1.5.1.tar.gz) = c36789ec381fec09f519249744ea36a77e5534b69446a59ee73b06cac29542eb
1
SHA256 (numpy-1.5.1.tar.gz) = c36789ec381fec09f519249744ea36a77e5534b69446a59ee73b06cac29542eb
3
SIZE (numpy-1.5.1.tar.gz) = 2280220
2
SIZE (numpy-1.5.1.tar.gz) = 2280220
4
MD5 (numpy-ref.pdf) = 05b9cef44d4e2c22e4c7963cecb988e4
5
SHA256 (numpy-ref.pdf) = 4ae481be313756dac9db43ca7cb6ea05eafc43262f8f6a1e2fde5397a69634a0
3
SHA256 (numpy-ref.pdf) = 4ae481be313756dac9db43ca7cb6ea05eafc43262f8f6a1e2fde5397a69634a0
6
SIZE (numpy-ref.pdf) = 5865550
4
SIZE (numpy-ref.pdf) = 5865550
7
MD5 (numpy-user.pdf) = 3a6ba806e2833d1acb6385f8e6a1cd86
8
SHA256 (numpy-user.pdf) = 4c0774547ed30323cb8c53718fb9be778f8ab9d49829772bf25f35cb482e90ab
5
SHA256 (numpy-user.pdf) = 4c0774547ed30323cb8c53718fb9be778f8ab9d49829772bf25f35cb482e90ab
9
SIZE (numpy-user.pdf) = 470154
6
SIZE (numpy-user.pdf) = 470154
10
MD5 (i387/fenv.c?p=203441) = d371542b4c2d17088d52f73862726496
11
SHA256 (i387/fenv.c?p=203441) = c7c558ddb6ab6604c83062fe0655d3ce8cf4d60edb4c9c82777962c49d23ca54
7
SHA256 (i387/fenv.c?p=203441) = c7c558ddb6ab6604c83062fe0655d3ce8cf4d60edb4c9c82777962c49d23ca54
12
SIZE (i387/fenv.c?p=203441) = 4791
8
SIZE (i387/fenv.c?p=203441) = 4791
13
MD5 (i387/fenv.h?p=203441) = d7c13d3c58b762a7a8814e7d6c585689
14
SHA256 (i387/fenv.h?p=203441) = 40c72f3cdd6990076394056e06461e1daeb6087b6a32f1962d3c33b0a00c0e0d
9
SHA256 (i387/fenv.h?p=203441) = 40c72f3cdd6990076394056e06461e1daeb6087b6a32f1962d3c33b0a00c0e0d
15
SIZE (i387/fenv.h?p=203441) = 6774
10
SIZE (i387/fenv.h?p=203441) = 6774
16
MD5 (amd64/fenv.c?p=203441) = be35d718bd9113d9efa6fc777298d12d
17
SHA256 (amd64/fenv.c?p=203441) = 9741a9ad3f8406f8292a268b0bc288dc7cb042e3e102440696d48c9a8b7955f0
11
SHA256 (amd64/fenv.c?p=203441) = 9741a9ad3f8406f8292a268b0bc288dc7cb042e3e102440696d48c9a8b7955f0
18
SIZE (amd64/fenv.c?p=203441) = 3601
12
SIZE (amd64/fenv.c?p=203441) = 3601
19
MD5 (amd64/fenv.h?p=203441) = 564a4e973990e4f66a5b3ab0e5ded5e1
20
SHA256 (amd64/fenv.h?p=203441) = 2daf607fea1bf7e8de5e174599d963fc3bbbe48e293cf2ff08e221351472c9d6
13
SHA256 (amd64/fenv.h?p=203441) = 2daf607fea1bf7e8de5e174599d963fc3bbbe48e293cf2ff08e221351472c9d6
21
SIZE (amd64/fenv.h?p=203441) = 5810
14
SIZE (amd64/fenv.h?p=203441) = 5810

Return to bug 154742