gitian: use CONFIG_SITE rather than hijacking the prefix
This commit is contained in:
parent
e6fa787a62
commit
acfb4cf7c5
|
@ -73,7 +73,7 @@ script: |
|
||||||
|
|
||||||
# Create the release tarball using (arbitrarily) the first host
|
# Create the release tarball using (arbitrarily) the first host
|
||||||
./autogen.sh
|
./autogen.sh
|
||||||
./configure --prefix=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`
|
CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
|
||||||
make dist
|
make dist
|
||||||
SOURCEDIST=`echo bitcoin-*.tar.gz`
|
SOURCEDIST=`echo bitcoin-*.tar.gz`
|
||||||
DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
|
DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
|
||||||
|
@ -94,11 +94,11 @@ script: |
|
||||||
mkdir -p ${INSTALLPATH}
|
mkdir -p ${INSTALLPATH}
|
||||||
tar --strip-components=1 -xf ../$SOURCEDIST
|
tar --strip-components=1 -xf ../$SOURCEDIST
|
||||||
|
|
||||||
./configure --prefix=${BASEPREFIX}/${i} --bindir=${INSTALLPATH}/bin --includedir=${INSTALLPATH}/include --libdir=${INSTALLPATH}/lib --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS}
|
CONFIG_SITE=${BASEPREFIX}/${i}/share/config.site ./configure --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS}
|
||||||
make ${MAKEOPTS}
|
make ${MAKEOPTS}
|
||||||
make ${MAKEOPTS} -C src check-security
|
make ${MAKEOPTS} -C src check-security
|
||||||
make ${MAKEOPTS} -C src check-symbols
|
make ${MAKEOPTS} -C src check-symbols
|
||||||
make install-strip
|
make install-strip DESTDIR=${INSTALLPATH}
|
||||||
cd installed
|
cd installed
|
||||||
find . -name "lib*.la" -delete
|
find . -name "lib*.la" -delete
|
||||||
find . -name "lib*.a" -delete
|
find . -name "lib*.a" -delete
|
||||||
|
|
|
@ -83,7 +83,7 @@ script: |
|
||||||
|
|
||||||
# Create the release tarball using (arbitrarily) the first host
|
# Create the release tarball using (arbitrarily) the first host
|
||||||
./autogen.sh
|
./autogen.sh
|
||||||
./configure --prefix=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`
|
CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
|
||||||
make dist
|
make dist
|
||||||
SOURCEDIST=`echo bitcoin-*.tar.gz`
|
SOURCEDIST=`echo bitcoin-*.tar.gz`
|
||||||
DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
|
DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
|
||||||
|
@ -105,9 +105,9 @@ script: |
|
||||||
mkdir -p ${INSTALLPATH}
|
mkdir -p ${INSTALLPATH}
|
||||||
tar --strip-components=1 -xf ../$SOURCEDIST
|
tar --strip-components=1 -xf ../$SOURCEDIST
|
||||||
|
|
||||||
./configure --prefix=${BASEPREFIX}/${i} --bindir=${INSTALLPATH}/bin --includedir=${INSTALLPATH}/include --libdir=${INSTALLPATH}/lib --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS}
|
CONFIG_SITE=${BASEPREFIX}/${i}/share/config.site ./configure --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS}
|
||||||
make ${MAKEOPTS}
|
make ${MAKEOPTS}
|
||||||
make install-strip
|
make install-strip DESTDIR=${INSTALLPATH}
|
||||||
|
|
||||||
make deploydir
|
make deploydir
|
||||||
mkdir -p unsigned-app-${i}
|
mkdir -p unsigned-app-${i}
|
||||||
|
|
|
@ -100,7 +100,7 @@ script: |
|
||||||
|
|
||||||
# Create the release tarball using (arbitrarily) the first host
|
# Create the release tarball using (arbitrarily) the first host
|
||||||
./autogen.sh
|
./autogen.sh
|
||||||
./configure --prefix=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`
|
CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
|
||||||
make dist
|
make dist
|
||||||
SOURCEDIST=`echo bitcoin-*.tar.gz`
|
SOURCEDIST=`echo bitcoin-*.tar.gz`
|
||||||
DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
|
DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
|
||||||
|
@ -124,11 +124,11 @@ script: |
|
||||||
mkdir -p ${INSTALLPATH}
|
mkdir -p ${INSTALLPATH}
|
||||||
tar --strip-components=1 -xf ../$SOURCEDIST
|
tar --strip-components=1 -xf ../$SOURCEDIST
|
||||||
|
|
||||||
./configure --prefix=${BASEPREFIX}/${i} --bindir=${INSTALLPATH}/bin --includedir=${INSTALLPATH}/include --libdir=${INSTALLPATH}/lib --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS}
|
CONFIG_SITE=${BASEPREFIX}/${i}/share/config.site ./configure --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS}
|
||||||
make ${MAKEOPTS}
|
make ${MAKEOPTS}
|
||||||
make ${MAKEOPTS} -C src check-security
|
make ${MAKEOPTS} -C src check-security
|
||||||
make deploy
|
make deploy
|
||||||
make install-strip
|
make install-strip DESTDIR=${INSTALLPATH}
|
||||||
cp -f bitcoin-*setup*.exe $OUTDIR/
|
cp -f bitcoin-*setup*.exe $OUTDIR/
|
||||||
cd installed
|
cd installed
|
||||||
mv ${DISTNAME}/bin/*.dll ${DISTNAME}/lib/
|
mv ${DISTNAME}/bin/*.dll ${DISTNAME}/lib/
|
||||||
|
|
Loading…
Reference in New Issue