Skip to content

Commit 689020e

Browse files
committed
wip
1 parent f55ff04 commit 689020e

File tree

2 files changed

+14
-13
lines changed

2 files changed

+14
-13
lines changed

cd/06_script_a.sh

+13-12
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,30 @@ export LC_ALL=C.UTF-8
99
GRIDCOIN_CONFIG_ALL="--disable-dependency-tracking --prefix=$DEPENDS_DIR/$HOST --bindir=$BASE_OUTDIR/bin --libdir=$BASE_OUTDIR/lib"
1010
DOCKER_EXEC "ccache --zero-stats --max-size=$CCACHE_SIZE"
1111

12+
DOCKER_EXEC mkdir -p "${BASE_BUILD_DIR}"
13+
export P_CI_DIR="${BASE_BUILD_DIR}/gridcoin-$HOST"
14+
1215
BEGIN_FOLD autogen
1316
if [ -n "$CONFIG_SHELL" ]; then
14-
DOCKER_EXEC "$CONFIG_SHELL" -c "./autogen.sh"
17+
DOCKER_EXEC "$CONFIG_SHELL" -c "{BASE_ROOT_DIR}/autogen.sh"
1518
else
16-
DOCKER_EXEC ./autogen.sh
19+
DOCKER_EXEC ${BASE_ROOT_DIR}/autogen.sh
1720
fi
1821
END_FOLD
1922

20-
DOCKER_EXEC mkdir -p "${BASE_BUILD_DIR}"
21-
export P_CI_DIR="${BASE_BUILD_DIR}"
23+
#export P_CI_DIR="${BASE_BUILD_DIR}"
2224

23-
BEGIN_FOLD configure
24-
DOCKER_EXEC "${BASE_ROOT_DIR}/configure" --cache-file=config.cache $GRIDCOIN_CONFIG_ALL $GRIDCOIN_CONFIG || ( (DOCKER_EXEC cat config.log) && false)
25-
END_FOLD
25+
#BEGIN_FOLD configure
26+
#DOCKER_EXEC "${BASE_ROOT_DIR}/configure" --cache-file=config.cache $GRIDCOIN_CONFIG_ALL $GRIDCOIN_CONFIG || ( (DOCKER_EXEC cat config.log) && false)
27+
#END_FOLD
2628

27-
BEGIN_FOLD distdir
28-
DOCKER_EXEC make distdir VERSION=$HOST
29-
END_FOLD
29+
#BEGIN_FOLD distdir
30+
#DOCKER_EXEC make distdir VERSION=$HOST
31+
#END_FOLD
3032

31-
export P_CI_DIR="${BASE_BUILD_DIR}/gridcoin-$HOST"
3233

3334
BEGIN_FOLD configure
34-
DOCKER_EXEC ./configure --cache-file=../config.cache $GRIDCOIN_CONFIG_ALL $GRIDCOIN_CONFIG || ( (DOCKER_EXEC cat config.log) && false)
35+
DOCKER_EXEC ../configure $GRIDCOIN_CONFIG_ALL $GRIDCOIN_CONFIG || ( (DOCKER_EXEC cat config.log) && false)
3536
END_FOLD
3637

3738
BEGIN_FOLD build

configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -1193,7 +1193,7 @@ AC_SUBST(QR_LIBS)
11931193
AC_CONFIG_FILES([Makefile src/Makefile share/setup.nsi share/qt/Info.plist])
11941194
AC_CONFIG_FILES([contrib/devtools/split-debug.sh],[chmod +x contrib/devtools/split-debug.sh])
11951195
AM_COND_IF([HAVE_DOXYGEN], [AC_CONFIG_FILES([doc/Doxyfile])])
1196-
AC_CONFIG_LINKS([CHANGELOG.md:CHANGELOG.md COPYING:COPYING])
1196+
#AC_CONFIG_LINKS([CHANGELOG.md:CHANGELOG.md COPYING:COPYING])
11971197

11981198
dnl boost's m4 checks do something really nasty: they export these vars. As a
11991199
dnl result, they leak into secp256k1's configure and crazy things happen.

0 commit comments

Comments
 (0)