diff --git a/dev-scheme/guile/guile-2.2.4.recipe b/dev-scheme/guile/guile-2.2.7.recipe similarity index 90% rename from dev-scheme/guile/guile-2.2.4.recipe rename to dev-scheme/guile/guile-2.2.7.recipe index da1708111..ba476e3a4 100644 --- a/dev-scheme/guile/guile-2.2.4.recipe +++ b/dev-scheme/guile/guile-2.2.7.recipe @@ -9,7 +9,7 @@ LICENSE="GNU LGPL v3" REVISION="2" SOURCE_URI="https://ftpmirror.gnu.org/guile/guile-$portVersion.tar.lz https://ftp.gnu.org/gnu/guile/guile-$portVersion.tar.lz" -CHECKSUM_SHA256="b72724cb59d4cc1eed005a10a960831efe0f1f7bf17cc6a88fbfab0a48b4bf5c" +CHECKSUM_SHA256="5de7c4d28fa25c232512a4d1e76e6152a721dde568a6b1310971e1ea49e18c46" PATCHES="guile-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 ?x86 x86_64" @@ -22,7 +22,7 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then commandBinDir=$prefix/bin fi -libguileVersion="1.3.1" +libguileVersion="1.4.2" libguileVersionCompat="$libguileVersion compat >= ${libguileVersion%%.*}" portVersionCompat="$portVersion compat >= ${portVersion%%.*}" portVers="${portVersion%.*}" @@ -86,7 +86,8 @@ defineDebugInfoPackage guile$secondaryArchSuffix \ BUILD() { CPPFLAGS="-D_BSD_SOURCE" LIBS="-lbsd -lnetwork" \ - runConfigure --omit-dirs binDir ./configure \ + runConfigure --omit-dirs binDir ./configure\ + --bindir=$commandBinDir\ --with-threads # No MADV_DONTNEED, yet @@ -108,19 +109,10 @@ INSTALL() fixPkgconfig - if [ "$commandBinDir" != "$binDir" ]; then - mkdir -p "$binDir" - mv "$commandBinDir"/guile-config "$binDir" - fi - packageEntries devel \ "$binDir"/guile-config \ "$dataDir"/aclocal \ "$developDir" - - if [ "$commandBinDir" != "$binDir" ]; then - rmdir "$binDir" - fi } TEST() diff --git a/dev-scheme/guile/patches/guile-2.2.4.patchset b/dev-scheme/guile/patches/guile-2.2.7.patchset similarity index 100% rename from dev-scheme/guile/patches/guile-2.2.4.patchset rename to dev-scheme/guile/patches/guile-2.2.7.patchset