===================================================================
RCS file: /home/cvs/OpenXM/src/gc/Makefile,v
retrieving revision 1.24
retrieving revision 1.30
diff -u -p -r1.24 -r1.30
--- OpenXM/src/gc/Makefile	2015/08/04 05:33:11	1.24
+++ OpenXM/src/gc/Makefile	2021/03/24 14:32:47	1.30
@@ -1,17 +1,15 @@
-# $OpenXM: OpenXM/src/gc/Makefile,v 1.23 2015/08/03 05:42:00 takayama Exp $
+# $OpenXM: OpenXM/src/gc/Makefile,v 1.29 2020/01/09 12:15:00 ohara Exp $
 OpenXM_HOME=../..
 PREFIX=${OpenXM_HOME}
 DISTDIR=${OpenXM_HOME}/../OpenXM_dist
 RM = /bin/rm
 MASTER_SITE=http://www.math.kobe-u.ac.jp/pub/OpenXM/misc/
-# Original. http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/
-#DISTNAME=gc-20150803-git
-DISTNAME=gc-7.4.2
-ATOMIC=libatomic_ops-7.4.0
+# Original. https://www.hboehm.info/gc/gc_source/
+DISTNAME=gc-7.6.12
+ATOMIC=libatomic_ops-7.6.10
 DISTFILES=${DISTNAME}.tar.gz ${ATOMIC}.tar.gz
 WRKSRC=work/${DISTNAME}
-# WRKSRC=work/gc-20150803-git/bdwgc
-#PATCHFILES = ${OpenXM_HOME}/../OpenXM_contrib2/asir2000/gc-7.diff
+#PATCHFILES = ${OpenXM_HOME}/../OpenXM_contrib2/asir-gc/gc-7.diff gc-cygwin64.diff
 PATCHFILES = 
 
 all : build
@@ -28,7 +26,7 @@ extract: fetch
 		for i in ${DISTFILES}; do cat ${DISTDIR}/$$i | (cd work; tar xzvf -) ; done ; \
 		chmod +x ${WRKSRC}/install-sh ; \
 	fi
-	(cd ${WRKSRC}; ln -sf ../${ATOMIC} libatomic_ops)
+	-(cd ${WRKSRC}; ln -sf ../${ATOMIC} libatomic_ops)
 	@touch work/.extract_done
 
 patch: extract
@@ -42,9 +40,32 @@ patch: extract
 configure : patch
 	@if [ ! -f work/.configure_done ]; then \
 		prefix=`cd ${OpenXM_HOME}; pwd` ; \
-		(cd ${WRKSRC}; ./configure --disable-threads --prefix="$$prefix" ) ; \
+		if [ -z $TARGET_TYPE ]; then \
+			if [  "`uname | sed -e 's/_.*$$//'`" = "CYGWIN" ]; then \
+			  make configure-cygwin ; \
+			elif [  "`uname | sed -e 's/_.*$$//'`" = "MSYS" ];  then \
+			  make configure-msys ; \
+			else \
+			  make configure-others ; \
+			fi ; \
+		else \
+		  make configure-cross ; \
+		fi ; \
 	fi
 	@touch work/.configure_done
+
+configure-cygwin:
+	prefix=`cd ${OpenXM_HOME}; pwd`  ; \
+	(cd ${WRKSRC}; ./configure --disable-threads --prefix=$$prefix )
+configure-msys:
+	prefix=`cd ${OpenXM_HOME}; pwd`  ; \
+	(cd ${WRKSRC}; ./configure --disable-threads --prefix=$$prefix --build=x86_64-w64-mingw32  )
+configure-others:
+	prefix=`cd ${OpenXM_HOME}; pwd`  ; \
+	(cd ${WRKSRC}; ./configure --disable-threads --prefix=$$prefix )
+configure-cross:
+	prefix=`cd ${OpenXM_HOME}; pwd`  ; \
+	(cd ${WRKSRC}; ./configure --host=${TARGET_TYPE} --disable-threads --prefix=$$prefix )
 
 build : configure
 	@if [ ! -f work/.build_done ]; then \