Attachment #128944 for bug #172852

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




# New ports collection makefile for:    openblas
# Date created: 17 Feb 2012
# Whom:         Eijiro Shibusawa <ej-sib@ice.uec.ac.jp>
#
# $FreeBSD: ports/math/openblas/Makefile,v 1.2 2012/09/10 01:47:43 maho Exp $
#

PORTNAME=	openblas
PORTVERSION=	0.2.4
CATEGORIES=	math
MASTER_SITES=	https://github.com/${GH_USER}/${GH_PORTNAME}/tarball/${GH_VERSION}/ \
		NL:lapack,lapack_tmg

FETCH_ARGS=	-pRr
GH_USER=	xianyi
GH_PORTNAME=	OpenBLAS
GH_REVISION=	3a26470
GH_VERSION=	v${PORTVERSION}
LAPACKVER=	3.4.2
LAPACK_SRCFILE=	lapack-${LAPACKVER}.tgz
LARGE_FILE=	large.tgz
TIMING_FILE=	timing.tgz

PLIST_FILES=	${OPENBLAS_FILES:S|^|lib/|}

MAKE_JOBS_SAFE=	yes
WRKSRC=		${WRKDIR}/${GH_USER}-${GH_PORTNAME}-ea9a46c

.if defined(PACKAGE_BUILDING)
DYNAMIC_ARCH_DEFAULT=	on

BUILDFLAGS+=	QUAD_PRECISION=1
.endif

.if ! ( defined(WITH_AVX) )
BUILDFLAGS+=	NO_AVX=1
.endif

post-extract:
	cd ${DISTDIR}/${DIST_SUBDIR} ; \
	${CP} ${LAPACK_SRCFILE} ${LARGE_FILE} ${TIMING_FILE} ${WRKSRC}

		${WRKSRC}/test/Makefile \
		${WRKSRC}/ctest/Makefile
.endif
.if ! ( defined(WITH_AVX) )
	${REINPLACE_CMD} -e "s+CPUTYPE_SANDYBRIDGE+CPUTYPE_NEHALEM+g" \
	 -e "s+CORE_SANDYBRIDGE+CORE_NEHALEM+g" \
		${WRKSRC}/cpuid_x86.c
.endif

do-build:
	cd ${WRKSRC} ; ${SETENV} ${BUILDFLAGS} NUM_THREADS=1 USE_THREAD=0 \

Lines 1-7 Link Here

(-)./distinfo (-4 / +4 lines)
1	SHA256 (openblas/xianyi-OpenBLAS-v0.2.3-0-g48f075c.tar.gz) = b9c10675a0c4b6b6adc4b0461749d6ec2d81f1498727935b9e38ec71a565a43e	1	SHA256 (openblas/xianyi-OpenBLAS-v0.2.4-0-g3a26470.tar.gz) = e5f7a46da2b2b2fc82a905650df14d0a0562c52c8ef6d83db8fe91899275335a
2	SIZE (openblas/xianyi-OpenBLAS-v0.2.3-0-g48f075c.tar.gz) = 3236430	2	SIZE (openblas/xianyi-OpenBLAS-v0.2.4-0-g3a26470.tar.gz) = 3249943
3	SHA256 (openblas/lapack-3.4.1.tgz) = 93b910f94f6091a2e71b59809c4db4a14655db527cfc5821ade2e8c8ab75380f	3	SHA256 (openblas/lapack-3.4.2.tgz) = 60a65daaf16ec315034675942618a2230521ea7adf85eea788ee54841072faf0
4	SIZE (openblas/lapack-3.4.1.tgz) = 6147915	4	SIZE (openblas/lapack-3.4.2.tgz) = 6168281
5	SHA256 (openblas/large.tgz) = f328d88b7fa97722f271d7d0cfea1c220e0f8e5ed5ff01d8ef1eb51d6f4243a1	5	SHA256 (openblas/large.tgz) = f328d88b7fa97722f271d7d0cfea1c220e0f8e5ed5ff01d8ef1eb51d6f4243a1
6	SIZE (openblas/large.tgz) = 2595	6	SIZE (openblas/large.tgz) = 2595
7	SHA256 (openblas/timing.tgz) = 999c65f8ea8bd4eac7f1c7f3463d4946917afd20a997807300fe35d70122f3af	7	SHA256 (openblas/timing.tgz) = 999c65f8ea8bd4eac7f1c7f3463d4946917afd20a997807300fe35d70122f3af




--- Makefile.orig	2012-10-09 21:08:28.000000000 +0900
+++ Makefile	2012-10-12 21:37:18.000000000 +0900
@@ -201,7 +201,7 @@
 netlib : 
 
 else
-netlib : lapack-3.4.2 patch.for_lapack-3.4.2 $(NETLIB_LAPACK_DIR)/make.inc
+netlib : lapack-%%LAPACKVER%% patch.for_lapack-%%LAPACKVER%% $(NETLIB_LAPACK_DIR)/make.inc
 ifndef NOFORTRAN
 	-@$(MAKE) -C $(NETLIB_LAPACK_DIR) lapacklib
 endif
@@ -210,7 +210,7 @@
 endif
 endif
 
-prof_lapack : lapack-3.4.2 $(NETLIB_LAPACK_DIR)/make.inc
+prof_lapack : lapack-%%LAPACKVER%% $(NETLIB_LAPACK_DIR)/make.inc
 	-@$(MAKE) -C $(NETLIB_LAPACK_DIR) lapack_prof
 
 $(NETLIB_LAPACK_DIR)/make.inc :
@@ -223,7 +223,7 @@
 	-@echo "LOADOPTS    = $(FFLAGS) $(EXTRALIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
 	-@echo "CC          = $(CC)" >> $(NETLIB_LAPACK_DIR)/make.inc
 	-@echo "CFLAGS      = $(CFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc

 	-@echo "ARCHFLAGS   = -ru" >> $(NETLIB_LAPACK_DIR)/make.inc
 	-@echo "RANLIB      = $(RANLIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
 	-@echo "LAPACKLIB   = ../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc
@@ -235,24 +235,19 @@
 	-@cat  make.inc >> $(NETLIB_LAPACK_DIR)/make.inc
 endif
 
-lapack-3.4.2 : lapack-3.4.2.tgz
+lapack-%%LAPACKVER%% : lapack-%%LAPACKVER%%.tgz
 ifndef NOFORTRAN
 ifndef NO_LAPACK
-	@if test `$(MD5SUM) lapack-3.4.2.tgz | $(AWK) '{print $$1}'` = 61bf1a8a4469d4bdb7604f5897179478; then \
-		echo $(TAR) zxf $< ;\
-		$(TAR) zxf $< && (cd $(NETLIB_LAPACK_DIR); $(PATCH) -p1 < ../patch.for_lapack-3.4.2) ;\
-		rm -f $(NETLIB_LAPACK_DIR)/lapacke/make.inc ;\
-	else \
-		rm -rf $(NETLIB_LAPACK_DIR) ;\
-		echo "	Cannot download lapack-3.4.2.tgz or the MD5 check sum is wrong (Please use orignal)."; \
-		exit 1; \
-	fi
+	echo $(TAR) zxf $< ;\

 endif
 endif
 
-LAPACK_URL=http://www.netlib.org/lapack/lapack-3.4.2.tgz
+LAPACK_URL=http://www.netlib.org/lapack/lapack-%%LAPACKVER%%.tgz
 
-lapack-3.4.2.tgz :
+lapack-%%LAPACKVER%%.tgz :
 ifndef NOFORTRAN
 #http://stackoverflow.com/questions/7656425/makefile-ifeq-logical-or
 ifeq ($(OSNAME), $(filter $(OSNAME),Darwin NetBSD))
@@ -276,7 +271,7 @@
 	-wget http://www.netlib.org/lapack/timing/timing.tgz
 endif
 
-lapack-timing : lapack-3.4.2 large.tgz timing.tgz
+lapack-timing : lapack-%%LAPACKVER%% large.tgz timing.tgz
 ifndef NOFORTRAN
 	(cd $(NETLIB_LAPACK_DIR); $(TAR) zxf ../timing.tgz TIMING)
 	(cd $(NETLIB_LAPACK_DIR)/TIMING; $(TAR) zxf ../../large.tgz )
@@ -314,4 +309,4 @@
 	rm -rf $(NETLIB_LAPACK_DIR) ;\
 	fi
 	@rm -f *.grd Makefile.conf_last config_last.h




--- Makefile.system.orig	2012-10-09 21:08:28.000000000 +0900
+++ Makefile.system	2012-10-12 21:33:31.000000000 +0900
@@ -10,7 +10,7 @@
 endif
 
 ifndef NETLIB_LAPACK_DIR
-NETLIB_LAPACK_DIR = $(TOPDIR)/lapack-3.4.2
+NETLIB_LAPACK_DIR = $(TOPDIR)/lapack-%%LAPACKVER%%
 endif
 
 # Default C compiler
@@ -125,6 +125,9 @@
 endif
 
 ifeq ($(OSNAME), FreeBSD)

 MD5SUM = md5 -r
 endif
 
@@ -753,15 +756,6 @@
 LIBSUFFIX = a
 endif
 

 ifndef SMP
 LIBNAME		= $(LIBPREFIX)$(REVISION).$(LIBSUFFIX)
 LIBNAME_P	= $(LIBPREFIX)$(REVISION)_p.$(LIBSUFFIX)
@@ -769,7 +763,6 @@
 LIBNAME		= $(LIBPREFIX)p$(REVISION).$(LIBSUFFIX)
 LIBNAME_P	= $(LIBPREFIX)p$(REVISION)_p.$(LIBSUFFIX)
 endif

 
 
 LIBDLLNAME   = $(LIBPREFIX).dll
@@ -783,7 +776,7 @@
 LIBS_P		= $(TOPDIR)/$(LIBNAME_P)
 
 export OSNAME

Return to bug 172852

Lines 1-7 Link Here

(-)./Makefile (-9 / +13 lines)
		1	# New ports collection makefile for: openblas
		2	# Date created: 17 Feb 2012
		3	# Whom: Eijiro Shibusawa <ej-sib@ice.uec.ac.jp>
		4	#
1	# $FreeBSD: ports/math/openblas/Makefile,v 1.2 2012/09/10 01:47:43 maho Exp $	5	# $FreeBSD: ports/math/openblas/Makefile,v 1.2 2012/09/10 01:47:43 maho Exp $
		6	#
2		7
3	PORTNAME= openblas	8	PORTNAME= openblas
4	PORTVERSION= 0.2.3	9	PORTVERSION= 0.2.4
5	CATEGORIES= math	10	CATEGORIES= math
6	MASTER_SITES= https://github.com/${GH_USER}/${GH_PORTNAME}/tarball/${GH_VERSION}/ \	11	MASTER_SITES= https://github.com/${GH_USER}/${GH_PORTNAME}/tarball/${GH_VERSION}/ \
7	NL:lapack,lapack_tmg	12	NL:lapack,lapack_tmg
Lines 20-28 Link Here
20	FETCH_ARGS= -pRr	25	FETCH_ARGS= -pRr
21	GH_USER= xianyi	26	GH_USER= xianyi
22	GH_PORTNAME= OpenBLAS	27	GH_PORTNAME= OpenBLAS
23	GH_REVISION= 48f075c	28	GH_REVISION= 3a26470
24	GH_VERSION= v${PORTVERSION}	29	GH_VERSION= v${PORTVERSION}
25	LAPACKVER= 3.4.1	30	LAPACKVER= 3.4.2
26	LAPACK_SRCFILE= lapack-${LAPACKVER}.tgz	31	LAPACK_SRCFILE= lapack-${LAPACKVER}.tgz
27	LARGE_FILE= large.tgz	32	LARGE_FILE= large.tgz
28	TIMING_FILE= timing.tgz	33	TIMING_FILE= timing.tgz
Lines 38-44 Link Here
38	PLIST_FILES= ${OPENBLAS_FILES:S\|^\|lib/\|}	43	PLIST_FILES= ${OPENBLAS_FILES:S\|^\|lib/\|}
39		44
40	MAKE_JOBS_SAFE= yes	45	MAKE_JOBS_SAFE= yes
41	WRKSRC= ${WRKDIR}/${GH_USER}-${GH_PORTNAME}-e552452	46	WRKSRC= ${WRKDIR}/${GH_USER}-${GH_PORTNAME}-ea9a46c
42		47
43	.if defined(PACKAGE_BUILDING)	48	.if defined(PACKAGE_BUILDING)
44	DYNAMIC_ARCH_DEFAULT= on	49	DYNAMIC_ARCH_DEFAULT= on
Lines 87-92 Link Here
87	BUILDFLAGS+= QUAD_PRECISION=1	92	BUILDFLAGS+= QUAD_PRECISION=1
88	.endif	93	.endif
89		94
		95	.if ! ( defined(WITH_AVX) )
		96	BUILDFLAGS+= NO_AVX=1
		97	.endif
		98
90	post-extract:	99	post-extract:
91	cd ${DISTDIR}/${DIST_SUBDIR} ; \	100	cd ${DISTDIR}/${DIST_SUBDIR} ; \
92	${CP} ${LAPACK_SRCFILE} ${LARGE_FILE} ${TIMING_FILE} ${WRKSRC}	101	${CP} ${LAPACK_SRCFILE} ${LARGE_FILE} ${TIMING_FILE} ${WRKSRC}
Lines 128-138 Link Here
128	${WRKSRC}/test/Makefile \	137	${WRKSRC}/test/Makefile \
129	${WRKSRC}/ctest/Makefile	138	${WRKSRC}/ctest/Makefile
130	.endif	139	.endif
131	.if ! ( defined(WITH_AVX) )
132	${REINPLACE_CMD} -e "s+CPUTYPE_SANDYBRIDGE+CPUTYPE_NEHALEM+g" \
133	-e "s+CORE_SANDYBRIDGE+CORE_NEHALEM+g" \
134	${WRKSRC}/cpuid_x86.c
135	.endif
136		140
137	do-build:	141	do-build:
138	cd ${WRKSRC} ; ${SETENV} ${BUILDFLAGS} NUM_THREADS=1 USE_THREAD=0 \	142	cd ${WRKSRC} ; ${SETENV} ${BUILDFLAGS} NUM_THREADS=1 USE_THREAD=0 \

Lines 1-24 Link Here

(-)./files/patch-Makefile (-17 / +17 lines)
1	--- Makefile.orig 2012-07-06 23:09:12.000000000 +0900	1	--- Makefile.orig 2012-10-09 21:08:28.000000000 +0900
2	+++ Makefile 2012-08-28 23:16:44.000000000 +0900	2	+++ Makefile 2012-10-12 21:37:18.000000000 +0900
3	@@ -203,7 +203,7 @@	3	@@ -201,7 +201,7 @@
4	netlib :	4	netlib :
5		5
6	else	6	else
7	-netlib : lapack-3.4.1 patch.for_lapack-3.4.1 $(NETLIB_LAPACK_DIR)/make.inc	7	-netlib : lapack-3.4.2 patch.for_lapack-3.4.2 $(NETLIB_LAPACK_DIR)/make.inc
8	+netlib : lapack-%%LAPACKVER%% patch.for_lapack-%%LAPACKVER%% $(NETLIB_LAPACK_DIR)/make.inc	8	+netlib : lapack-%%LAPACKVER%% patch.for_lapack-%%LAPACKVER%% $(NETLIB_LAPACK_DIR)/make.inc
9	ifndef NOFORTRAN	9	ifndef NOFORTRAN
10	-@$(MAKE) -C $(NETLIB_LAPACK_DIR) lapacklib	10	-@$(MAKE) -C $(NETLIB_LAPACK_DIR) lapacklib
11	endif	11	endif
12	@@ -212,7 +212,7 @@	12	@@ -210,7 +210,7 @@
13	endif	13	endif
14	endif	14	endif
15		15
16	-prof_lapack : lapack-3.4.1 $(NETLIB_LAPACK_DIR)/make.inc	16	-prof_lapack : lapack-3.4.2 $(NETLIB_LAPACK_DIR)/make.inc
17	+prof_lapack : lapack-%%LAPACKVER%% $(NETLIB_LAPACK_DIR)/make.inc	17	+prof_lapack : lapack-%%LAPACKVER%% $(NETLIB_LAPACK_DIR)/make.inc
18	-@$(MAKE) -C $(NETLIB_LAPACK_DIR) lapack_prof	18	-@$(MAKE) -C $(NETLIB_LAPACK_DIR) lapack_prof
19		19
20	$(NETLIB_LAPACK_DIR)/make.inc :	20	$(NETLIB_LAPACK_DIR)/make.inc :
21	@@ -225,7 +225,7 @@	21	@@ -223,7 +223,7 @@
22	-@echo "LOADOPTS = $(FFLAGS) $(EXTRALIB)" >> $(NETLIB_LAPACK_DIR)/make.inc	22	-@echo "LOADOPTS = $(FFLAGS) $(EXTRALIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
23	-@echo "CC = $(CC)" >> $(NETLIB_LAPACK_DIR)/make.inc	23	-@echo "CC = $(CC)" >> $(NETLIB_LAPACK_DIR)/make.inc
24	-@echo "CFLAGS = $(CFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc	24	-@echo "CFLAGS = $(CFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
Lines 27-47 Link Here
27	-@echo "ARCHFLAGS = -ru" >> $(NETLIB_LAPACK_DIR)/make.inc	27	-@echo "ARCHFLAGS = -ru" >> $(NETLIB_LAPACK_DIR)/make.inc
28	-@echo "RANLIB = $(RANLIB)" >> $(NETLIB_LAPACK_DIR)/make.inc	28	-@echo "RANLIB = $(RANLIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
29	-@echo "LAPACKLIB = ../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc	29	-@echo "LAPACKLIB = ../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc
30	@@ -237,24 +237,19 @@	30	@@ -235,24 +235,19 @@
31	-@cat make.inc >> $(NETLIB_LAPACK_DIR)/make.inc	31	-@cat make.inc >> $(NETLIB_LAPACK_DIR)/make.inc
32	endif	32	endif
33		33
34	-lapack-3.4.1 : lapack-3.4.1.tgz	34	-lapack-3.4.2 : lapack-3.4.2.tgz
35	+lapack-%%LAPACKVER%% : lapack-%%LAPACKVER%%.tgz	35	+lapack-%%LAPACKVER%% : lapack-%%LAPACKVER%%.tgz
36	ifndef NOFORTRAN	36	ifndef NOFORTRAN
37	ifndef NO_LAPACK	37	ifndef NO_LAPACK
38	- @if test `$(MD5SUM) lapack-3.4.1.tgz \| $(AWK) '{print $$1}'` = 44c3869c38c8335c2b9c2a8bb276eb55; then \	38	- @if test `$(MD5SUM) lapack-3.4.2.tgz \| $(AWK) '{print $$1}'` = 61bf1a8a4469d4bdb7604f5897179478; then \
39	- echo $(TAR) zxf $< ;\	39	- echo $(TAR) zxf $< ;\
40	- $(TAR) zxf $< && (cd $(NETLIB_LAPACK_DIR); $(PATCH) -p1 < ../patch.for_lapack-3.4.1) ;\	40	- $(TAR) zxf $< && (cd $(NETLIB_LAPACK_DIR); $(PATCH) -p1 < ../patch.for_lapack-3.4.2) ;\
41	- rm -f $(NETLIB_LAPACK_DIR)/lapacke/make.inc ;\	41	- rm -f $(NETLIB_LAPACK_DIR)/lapacke/make.inc ;\
42	- else \	42	- else \
43	- rm -rf $(NETLIB_LAPACK_DIR) ;\	43	- rm -rf $(NETLIB_LAPACK_DIR) ;\
44	- echo " Cannot download lapack-3.4.1.tgz or the MD5 check sum is wrong (Please use orignal)."; \	44	- echo " Cannot download lapack-3.4.2.tgz or the MD5 check sum is wrong (Please use orignal)."; \
45	- exit 1; \	45	- exit 1; \
46	- fi	46	- fi
47	+ echo $(TAR) zxf $< ;\	47	+ echo $(TAR) zxf $< ;\
Lines 51-74 Link Here
51	endif	51	endif
52	endif	52	endif
53		53
54	-LAPACK_URL=http://www.netlib.org/lapack/lapack-3.4.1.tgz	54	-LAPACK_URL=http://www.netlib.org/lapack/lapack-3.4.2.tgz
55	+LAPACK_URL=http://www.netlib.org/lapack/lapack-%%LAPACKVER%%.tgz	55	+LAPACK_URL=http://www.netlib.org/lapack/lapack-%%LAPACKVER%%.tgz
56		56
57	-lapack-3.4.1.tgz :	57	-lapack-3.4.2.tgz :
58	+lapack-%%LAPACKVER%%.tgz :	58	+lapack-%%LAPACKVER%%.tgz :
59	ifndef NOFORTRAN	59	ifndef NOFORTRAN
60	#http://stackoverflow.com/questions/7656425/makefile-ifeq-logical-or	60	#http://stackoverflow.com/questions/7656425/makefile-ifeq-logical-or
61	ifeq ($(OSNAME), $(filter $(OSNAME),Darwin NetBSD))	61	ifeq ($(OSNAME), $(filter $(OSNAME),Darwin NetBSD))
62	@@ -278,7 +273,7 @@	62	@@ -276,7 +271,7 @@
63	-wget http://www.netlib.org/lapack/timing/timing.tgz	63	-wget http://www.netlib.org/lapack/timing/timing.tgz
64	endif	64	endif
65		65
66	-lapack-timing : lapack-3.4.1 large.tgz timing.tgz	66	-lapack-timing : lapack-3.4.2 large.tgz timing.tgz
67	+lapack-timing : lapack-%%LAPACKVER%% large.tgz timing.tgz	67	+lapack-timing : lapack-%%LAPACKVER%% large.tgz timing.tgz
68	ifndef NOFORTRAN	68	ifndef NOFORTRAN
69	(cd $(NETLIB_LAPACK_DIR); $(TAR) zxf ../timing.tgz TIMING)	69	(cd $(NETLIB_LAPACK_DIR); $(TAR) zxf ../timing.tgz TIMING)
70	(cd $(NETLIB_LAPACK_DIR)/TIMING; $(TAR) zxf ../../large.tgz )	70	(cd $(NETLIB_LAPACK_DIR)/TIMING; $(TAR) zxf ../../large.tgz )
71	@@ -316,4 +311,4 @@	71	@@ -314,4 +309,4 @@
72	rm -rf $(NETLIB_LAPACK_DIR) ;\	72	rm -rf $(NETLIB_LAPACK_DIR) ;\
73	fi	73	fi
74	@rm -f *.grd Makefile.conf_last config_last.h	74	@rm -f *.grd Makefile.conf_last config_last.h

Lines 1-15 Link Here

(-)./files/patch-Makefile.system (-7 / +7 lines)
1	--- Makefile.system.orig 2012-08-20 17:52:35.000000000 +0900	1	--- Makefile.system.orig 2012-10-09 21:08:28.000000000 +0900
2	+++ Makefile.system 2012-08-29 22:42:27.000000000 +0900	2	+++ Makefile.system 2012-10-12 21:33:31.000000000 +0900
3	@@ -10,7 +10,7 @@	3	@@ -10,7 +10,7 @@
4	endif	4	endif
5		5
6	ifndef NETLIB_LAPACK_DIR	6	ifndef NETLIB_LAPACK_DIR
7	-NETLIB_LAPACK_DIR = $(TOPDIR)/lapack-3.4.1	7	-NETLIB_LAPACK_DIR = $(TOPDIR)/lapack-3.4.2
8	+NETLIB_LAPACK_DIR = $(TOPDIR)/lapack-%%LAPACKVER%%	8	+NETLIB_LAPACK_DIR = $(TOPDIR)/lapack-%%LAPACKVER%%
9	endif	9	endif
10		10
11	# Default C compiler	11	# Default C compiler
12	@@ -117,6 +117,9 @@	12	@@ -125,6 +125,9 @@
13	endif	13	endif
14		14
15	ifeq ($(OSNAME), FreeBSD)	15	ifeq ($(OSNAME), FreeBSD)
Lines 19-25 Link Here
19	MD5SUM = md5 -r	19	MD5SUM = md5 -r
20	endif	20	endif
21		21
22	@@ -714,15 +717,6 @@	22	@@ -753,15 +756,6 @@
23	LIBSUFFIX = a	23	LIBSUFFIX = a
24	endif	24	endif
25		25
Lines 35-41 Link Here
35	ifndef SMP	35	ifndef SMP
36	LIBNAME = $(LIBPREFIX)$(REVISION).$(LIBSUFFIX)	36	LIBNAME = $(LIBPREFIX)$(REVISION).$(LIBSUFFIX)
37	LIBNAME_P = $(LIBPREFIX)$(REVISION)_p.$(LIBSUFFIX)	37	LIBNAME_P = $(LIBPREFIX)$(REVISION)_p.$(LIBSUFFIX)
38	@@ -730,7 +724,6 @@	38	@@ -769,7 +763,6 @@
39	LIBNAME = $(LIBPREFIX)p$(REVISION).$(LIBSUFFIX)	39	LIBNAME = $(LIBPREFIX)p$(REVISION).$(LIBSUFFIX)
40	LIBNAME_P = $(LIBPREFIX)p$(REVISION)_p.$(LIBSUFFIX)	40	LIBNAME_P = $(LIBPREFIX)p$(REVISION)_p.$(LIBSUFFIX)
41	endif	41	endif
Lines 43-49 Link Here
43		43
44		44
45	LIBDLLNAME = $(LIBPREFIX).dll	45	LIBDLLNAME = $(LIBPREFIX).dll
46	@@ -744,7 +737,7 @@	46	@@ -783,7 +776,7 @@
47	LIBS_P = $(TOPDIR)/$(LIBNAME_P)	47	LIBS_P = $(TOPDIR)/$(LIBNAME_P)
48		48
49	export OSNAME	49	export OSNAME