diff --git a/bootstrap.sh b/bootstrap.sh index 73a95d6..2942e0d 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -26,6 +26,11 @@ fi # - sed # - tar +# TODO add these libraries +# - libsamplerate +# - opus (custom) +# - libdb (berkley, 4.8) + source setup/check_target.sh source setup/env.sh source setup/functions.sh @@ -132,6 +137,11 @@ build_autoconf fftwf "${FFTW_VERSION}" "${FFTWF_EXTRAFLAGS}" if [ "${MACOS}" -eq 1 ]; then download aften "${AFTEN_VERSION}" "http://downloads.sourceforge.net/aften" "tar.bz2" build_cmake aften "${AFTEN_VERSION}" + if [ ! -f "${PAWPAW_BUILDDIR}/aften-${AFTEN_VERSION}/.stamp_installed_libs2" ]; then + cp -v "${PAWPAW_BUILDDIR}/aften-${AFTEN_VERSION}/build/libaften_pcm.a" "${PAWPAW_PREFIX}/lib/libaften_pcm.a" + cp -v "${PAWPAW_BUILDDIR}/aften-${AFTEN_VERSION}/build/libaften_static.a" "${PAWPAW_PREFIX}/lib/libaften.a" + touch "${PAWPAW_BUILDDIR}/aften-${AFTEN_VERSION}/.stamp_installed_libs" + fi fi # --------------------------------------------------------------------------------------------------------------------- diff --git a/setup/functions.sh b/setup/functions.sh index eb8e105..b746e54 100644 --- a/setup/functions.sh +++ b/setup/functions.sh @@ -205,21 +205,21 @@ function build_cmake() { if [ ! -f "${pkgdir}/.stamp_configured" ]; then pushd "${pkgdir}/build" cmake -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_INSTALL_PREFIX="${PAWPAW_PREFIX}" ${extraconfrules} .. - touch .stamp_configured + touch ../.stamp_configured popd fi if [ ! -f "${pkgdir}/.stamp_built" ]; then pushd "${pkgdir}/build" make ${MAKE_ARGS} - touch .stamp_built + touch ../.stamp_built popd fi if [ ! -f "${pkgdir}/.stamp_installed" ]; then pushd "${pkgdir}/build" make ${MAKE_ARGS} install - touch .stamp_installed + touch ../.stamp_installed popd fi