From c79606413ff4c73007c2ed657153f55989a437ad Mon Sep 17 00:00:00 2001 From: Maho Nakata Date: Sun, 7 Feb 2010 07:29:23 +0000 Subject: Build fix on i386. --- math/gotoblas/Makefile | 17 +++- math/gotoblas/files/patch-Makefile | 24 ++--- math/gotoblas/files/patch-Makefile.system | 137 +---------------------------- math/gotoblas/files/patch-c_check | 2 +- math/gotoblas/files/patch-exports+Makefile | 45 ---------- math/gotoblas/files/patch-laswp+Makefile | 11 --- 6 files changed, 29 insertions(+), 207 deletions(-) delete mode 100644 math/gotoblas/files/patch-exports+Makefile delete mode 100644 math/gotoblas/files/patch-laswp+Makefile (limited to 'math') diff --git a/math/gotoblas/Makefile b/math/gotoblas/Makefile index 05fdbf54c2bb..642291c53609 100644 --- a/math/gotoblas/Makefile +++ b/math/gotoblas/Makefile @@ -89,7 +89,18 @@ pre-build:: @${ECHO_CMD} "****" post-patch: - @${REINPLACE_CMD} -e "s+%%FC%%+${FC}+" -e "s+%%CC%%+${CC}+" ${WRKSRC}/Makefile.rule + ${REINPLACE_CMD} -e "s+%%FC%%+${FC}+" -e "s+%%CC%%+${CC}+" ${WRKSRC}/Makefile.rule + ${REINPLACE_CMD} -e "s+(ARCH)+(ARCH_)+" ${WRKSRC}/Makefile.system + ${REINPLACE_CMD} -e "s+(ARCH)+(ARCH_)+" ${WRKSRC}/Makefile.rule + ${REINPLACE_CMD} -e "s+(ARCH)+(ARCH_)+" ${WRKSRC}/Makefile.tail + ${REINPLACE_CMD} -e "s+(ARCH)+(ARCH_)+" ${WRKSRC}/driver/level3/Makefile + ${REINPLACE_CMD} -e "s+(ARCH)+(ARCH_)+" ${WRKSRC}/driver/others/Makefile + ${REINPLACE_CMD} -e "s+(ARCH)+(ARCH_)+" ${WRKSRC}/exports/Makefile + ${REINPLACE_CMD} -e "s+(ARCH)+(ARCH_)+" ${WRKSRC}/interface/Makefile + ${REINPLACE_CMD} -e "s+(ARCH)+(ARCH_)+" ${WRKSRC}/kernel/Makefile + ${REINPLACE_CMD} -e "s+(ARCH)+(ARCH_)+" ${WRKSRC}/kernel/Makefile.L3 + ${REINPLACE_CMD} -e "s+(ARCH)+(ARCH_)+" ${WRKSRC}/lapack/laswp/Makefile + ${REINPLACE_CMD} -e "s+(ARCH)+(ARCH_)+" ${WRKSRC}/reference/Makefile do-build: ${CP} ${DISTDIR}/${DIST_SUBDIR}/${LAPACK_SRCFILE} ${WRKSRC} @@ -103,8 +114,8 @@ do-build: cd ${WRKSRC} && ${GMAKE} clean cd ${WRKSRC}/exports && ${GMAKE} clean - cd ${WRKSRC} && ${GMAKE} ${MAKE_FLAGS} USE_THREAD=0 #DYNAMIC_ARCH=0 - cd ${WRKSRC}/exports && ${GMAKE} ${MAKE_FLAGS} USE_THREAD=0 #DYNAMIC_ARCH=0 + cd ${WRKSRC} && ${GMAKE} ${MAKE_FLAGS} USE_THREAD=0 #DYNAMIC_ARCH=1 + cd ${WRKSRC}/exports && ${GMAKE} ${MAKE_FLAGS} USE_THREAD=0 #DYNAMIC_ARCH=1 ${INSTALL_DATA} ${WRKSRC}/libgoto2.a ${WRKDIR}/lib/libgoto2.a ${INSTALL_DATA} ${WRKSRC}/libgoto2.so ${WRKDIR}/lib/libgoto2.so diff --git a/math/gotoblas/files/patch-Makefile b/math/gotoblas/files/patch-Makefile index 7b5218c677cf..442f4c7c0ad3 100644 --- a/math/gotoblas/files/patch-Makefile +++ b/math/gotoblas/files/patch-Makefile @@ -1,6 +1,15 @@ ---- Makefile.orig 2009-11-11 06:46:48.000000000 +0900 -+++ Makefile 2010-02-02 10:44:34.000000000 +0900 -@@ -154,7 +154,7 @@ +--- Makefile 2010-01-21 05:54:38.000000000 +0900 ++++ Makefile 2010-02-07 15:41:11.000000000 +0900 +@@ -23,7 +23,7 @@ + @echo " GotoBLAS build complete." + @echo + @echo " OS ... $(OSNAME) " +- @echo " Architecture ... $(ARCH) " ++ @echo " Architecture ... $(ARCH_) " + ifndef BINARY64 + @echo " BINARY ... 32bit " + else +@@ -158,7 +158,7 @@ -@echo "NOOPT = $(FFLAGS) -O0" >> lapack-3.1.1/make.inc -@echo "PNOOPT = $(FPFLAGS) -O0" >> lapack-3.1.1/make.inc -@echo "LOADOPTS = $(FFLAGS) $(EXTRALIB)" >> lapack-3.1.1/make.inc @@ -9,7 +18,7 @@ -@echo "RANLIB = $(RANLIB)" >> lapack-3.1.1/make.inc -@echo "LAPACKLIB = ../$(LIBNAME)" >> lapack-3.1.1/make.inc -@echo "LAPACKLIB_P = ../$(LIBNAME_P)" >> lapack-3.1.1/make.inc -@@ -166,7 +166,7 @@ +@@ -170,7 +170,7 @@ lapack-3.1.1 : lapack-3.1.1.tgz ifndef NOFORTRAN @@ -18,10 +27,3 @@ echo $(TAR) zxf $< ;\ $(TAR) zxf $< && (cd lapack-3.1.1; $(PATCH) -p1 < ../patch.for_lapack-3.1.1) ;\ else \ -@@ -223,4 +223,4 @@ - echo deleting lapack-3.1.1; \ - rm -rf lapack-3.1.1 ;\ - fi -- @echo Done. -\ No newline at end of file -+ @echo Done. diff --git a/math/gotoblas/files/patch-Makefile.system b/math/gotoblas/files/patch-Makefile.system index e54a3fc5d8e1..c0f308d8eca6 100644 --- a/math/gotoblas/files/patch-Makefile.system +++ b/math/gotoblas/files/patch-Makefile.system @@ -11,141 +11,6 @@ ifeq ($(OSNAME), AIX) EXTRALIB += -lm endif -@@ -135,8 +139,8 @@ - NO_EXPRECISION = 1 - endif - --ifneq ($(ARCH), x86) --ifneq ($(ARCH), x86_64) -+ifneq ($(GARCH), x86) -+ifneq ($(GARCH), x86_64) - NO_EXPRECISION = 1 - endif - endif -@@ -145,7 +149,7 @@ - # Architecture dependent settings - # - --ifeq ($(ARCH), x86) -+ifeq ($(GARCH), x86) - ifndef BINARY - NO_BINARY_MODE = 1 - endif -@@ -160,7 +164,7 @@ - endif - endif - --ifeq ($(ARCH), x86_64) -+ifeq ($(GARCH), x86_64) - ifndef NO_EXPRECISION - ifeq ($(F_COMPILER), GFORTRAN) - ifeq ($(C_COMPILER), GCC) -@@ -201,12 +205,12 @@ - - - ifdef DYNAMIC_ARCH --ifeq ($(ARCH), x86) -+ifeq ($(GARCH), x86) - DYNAMIC_CORE = KATMAI COPPERMINE NORTHWOOD PRESCOTT BANIAS \ - CORE2 PENRYN DUNNINGTON NEHALEM ATHLON OPTERON OPTERON_SSE3 BARCELONA ATOM NANO - endif - --ifeq ($(ARCH), x86_64) -+ifeq ($(GARCH), x86_64) - DYNAMIC_CORE = PRESCOTT CORE2 PENRYN DUNNINGTON NEHALEM OPTERON OPTERON_SSE3 BARCELONA ATOM NANO - endif - -@@ -215,7 +219,7 @@ - endif - endif - --ifeq ($(ARCH), ia64) -+ifeq ($(GARCH), ia64) - NO_BINARY_MODE = 1 - BINARY_DEFINED = 1 - -@@ -227,11 +231,11 @@ - endif - endif - --ifeq ($(ARCH), mips64) -+ifeq ($(GARCH), mips64) - NO_BINARY_MODE = 1 - endif - --ifeq ($(ARCH), alpha) -+ifeq ($(GARCH), alpha) - NO_BINARY_MODE = 1 - BINARY_DEFINED = 1 - endif -@@ -247,7 +251,7 @@ - - ifdef NO_BINARY_MODE - --ifeq ($(ARCH), mips64) -+ifeq ($(GARCH), mips64) - ifdef BINARY64 - CCOMMON_OPT += -mabi=64 - else -@@ -320,7 +324,7 @@ - CCOMMON_OPT += -DF_INTERFACE_GFORT - FCOMMON_OPT += -Wall - ifdef NO_BINARY_MODE --ifeq ($(ARCH), mips64) -+ifeq ($(GARCH), mips64) - ifdef BINARY64 - FCOMMON_OPT += -mabi=64 - else -@@ -399,7 +403,7 @@ - endif - endif - --ifneq ($(ARCH), mips64) -+ifneq ($(GARCH), mips64) - ifndef BINARY64 - FCOMMON_OPT += -m32 - else -@@ -447,7 +451,7 @@ - - ifeq ($(C_COMPILER), SUN) - CCOMMON_OPT += -w --ifeq ($(ARCH), x86) -+ifeq ($(GARCH), x86) - CCOMMON_OPT += -m32 - else - FCOMMON_OPT += -m64 -@@ -499,7 +503,7 @@ - ifdef SMP - CCOMMON_OPT += -DSMP_SERVER - --ifeq ($(ARCH), mips64) -+ifeq ($(GARCH), mips64) - USE_SIMPLE_THREADED_LEVEL3 = 1 - endif - -@@ -542,9 +546,9 @@ - - LIBPREFIX = libgoto2 - --KERNELDIR = $(TOPDIR)/kernel/$(ARCH) -+KERNELDIR = $(TOPDIR)/kernel/$(GARCH) - --include $(TOPDIR)/Makefile.$(ARCH) -+include $(TOPDIR)/Makefile.$(GARCH) - - CCOMMON_OPT += -DASMNAME=$(FU)$(*F) -DASMFNAME=$(FU)$(*F)$(BU) -DNAME=$(*F)$(BU) -DCNAME=$(*F) -DCHAR_NAME=\"$(*F)$(BU)\" -DCHAR_CNAME=\"$(*F)\" - -@@ -560,8 +564,8 @@ - NO_AFFINITY = 1 - endif - --ifneq ($(ARCH), x86_64) --ifneq ($(ARCH), x86) -+ifneq ($(GARCH), x86_64) -+ifneq ($(GARCH), x86) - NO_AFFINITY = 1 - endif - endif @@ -604,7 +608,7 @@ GREP = grep endif @@ -160,7 +25,7 @@ export OSNAME -export ARCH -+export GARCH ++export ARCH_ export CORE export LIBCORE export PGCPATH diff --git a/math/gotoblas/files/patch-c_check b/math/gotoblas/files/patch-c_check index c6eae695ef1c..cf155b27db4f 100644 --- a/math/gotoblas/files/patch-c_check +++ b/math/gotoblas/files/patch-c_check @@ -14,7 +14,7 @@ print MAKEFILE "OSNAME=$os\n"; -print MAKEFILE "ARCH=$architecture\n"; -+print MAKEFILE "GARCH=$architecture\n"; ++print MAKEFILE "ARCH_=$architecture\n"; print MAKEFILE "C_COMPILER=$compiler\n"; print MAKEFILE "BINARY32=\n" if $binformat ne bin32; print MAKEFILE "BINARY64=\n" if $binformat ne bin64; diff --git a/math/gotoblas/files/patch-exports+Makefile b/math/gotoblas/files/patch-exports+Makefile deleted file mode 100644 index a91f5d77ec36..000000000000 --- a/math/gotoblas/files/patch-exports+Makefile +++ /dev/null @@ -1,45 +0,0 @@ ---- exports/Makefile 2010-02-06 01:01:00.000000000 +0900 -+++ exports/Makefile 2010-02-06 12:19:59.000000000 +0900 -@@ -75,13 +75,13 @@ - -Wl,--out-implib,libgoto2_shared.lib $(FEXTRALIB) - - libgoto2.def : gensymbol -- perl ./gensymbol win2k $(ARCH) dummy $(EXPRECISION) $(NO_CBLAS) > $(@F) -+ perl ./gensymbol win2k $(GARCH) dummy $(EXPRECISION) $(NO_CBLAS) > $(@F) - - libgoto2_shared.def : gensymbol -- perl ./gensymbol win2k $(ARCH) dummy $(EXPRECISION) $(NO_CBLAS) > $(@F) -+ perl ./gensymbol win2k $(GARCH) dummy $(EXPRECISION) $(NO_CBLAS) > $(@F) - - libgoto_hpl.def : gensymbol -- perl ./gensymbol win2khpl $(ARCH) dummy $(EXPRECISION) $(NO_CBLAS) > $(@F) -+ perl ./gensymbol win2khpl $(GARCH) dummy $(EXPRECISION) $(NO_CBLAS) > $(@F) - - $(LIBDYNNAME) : ../$(LIBNAME) osx.def - $(PREFIX)gcc $(CFLAGS) -all_load -dynamiclib -o $(LIBDYNNAME) $< -Wl,-exported_symbols_list,osx.def $(FEXTRALIB) -@@ -162,13 +162,13 @@ - rm -f goto.$(SUFFIX) - - linux.def : gensymbol ../Makefile.system ../getarch.c -- perl ./gensymbol linux $(ARCH) $(BU) $(EXPRECISION) $(NO_CBLAS) > $(@F) -+ perl ./gensymbol linux $(GARCH) $(BU) $(EXPRECISION) $(NO_CBLAS) > $(@F) - - osx.def : gensymbol ../Makefile.system ../getarch.c -- perl ./gensymbol osx $(ARCH) $(BU) $(EXPRECISION) $(NO_CBLAS) > $(@F) -+ perl ./gensymbol osx $(GARCH) $(BU) $(EXPRECISION) $(NO_CBLAS) > $(@F) - - aix.def : gensymbol ../Makefile.system ../getarch.c -- perl ./gensymbol aix $(ARCH) $(BU) $(EXPRECISION) $(NO_CBLAS) > $(@F) -+ perl ./gensymbol aix $(GARCH) $(BU) $(EXPRECISION) $(NO_CBLAS) > $(@F) - - symbol.S : gensymbol - perl ./gensymbol win2kasm noarch dummy $(EXPRECISION) $(NO_CBLAS) > symbol.S -@@ -178,7 +178,7 @@ - rm -f linktest - - linktest.c : gensymbol ../Makefile.system ../getarch.c -- perl ./gensymbol linktest $(ARCH) $(BU) $(EXPRECISION) $(NO_CBLAS) > linktest.c -+ perl ./gensymbol linktest $(GARCH) $(BU) $(EXPRECISION) $(NO_CBLAS) > linktest.c - - clean :: - @rm -f *.def *.dylib __.SYMDEF* diff --git a/math/gotoblas/files/patch-laswp+Makefile b/math/gotoblas/files/patch-laswp+Makefile deleted file mode 100644 index 96de0b4cd6b5..000000000000 --- a/math/gotoblas/files/patch-laswp+Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- lapack/laswp/Makefile~ 2009-07-20 23:53:13.000000000 +0900 -+++ lapack/laswp/Makefile 2009-09-03 15:52:41.000000000 +0900 -@@ -16,7 +16,7 @@ - qlaswp_plus.$(PSUFFIX) qlaswp_minus.$(PSUFFIX) \ - claswp_plus.$(PSUFFIX) claswp_minus.$(PSUFFIX) zlaswp_plus.$(PSUFFIX) zlaswp_minus.$(PSUFFIX) \ - xlaswp_plus.$(PSUFFIX) xlaswp_minus.$(PSUFFIX) : dummy -- cd $(ARCH) && $(MAKE) ../$(@F) -+ cd $(GARCH) && $(MAKE) ../$(@F) - - include ../../Makefile.tail - -- cgit v1.2.3