=================================================================== RCS file: /home/cvs/OpenXM/src/gc/Makefile,v retrieving revision 1.24 retrieving revision 1.28 diff -u -p -r1.24 -r1.28 --- OpenXM/src/gc/Makefile 2015/08/04 05:33:11 1.24 +++ OpenXM/src/gc/Makefile 2020/01/08 16:07:09 1.28 @@ -1,4 +1,4 @@ -# $OpenXM: OpenXM/src/gc/Makefile,v 1.23 2015/08/03 05:42:00 takayama Exp $ +# $OpenXM: OpenXM/src/gc/Makefile,v 1.27 2020/01/04 15:57:37 ohara Exp $ OpenXM_HOME=../.. PREFIX=${OpenXM_HOME} DISTDIR=${OpenXM_HOME}/../OpenXM_dist @@ -11,8 +11,7 @@ ATOMIC=libatomic_ops-7.4.0 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 = +PATCHFILES = ${OpenXM_HOME}/../OpenXM_contrib2/asir-gc/gc-7.diff gc-cygwin64.diff all : build @@ -28,7 +27,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 +41,25 @@ patch: extract configure : patch @if [ ! -f work/.configure_done ]; then \ prefix=`cd ${OpenXM_HOME}; pwd` ; \ - (cd ${WRKSRC}; ./configure --disable-threads --prefix="$$prefix" ) ; \ + 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 ; \ 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 ) build : configure @if [ ! -f work/.build_done ]; then \