From 49bb0f149860bdbcbe8b9b9dc34846337961e205 Mon Sep 17 00:00:00 2001 From: Peter Marquardt Date: Fri, 14 Feb 2020 12:26:54 +0100 Subject: [PATCH] haskell-platform-minimal-binary: fix missing lib - insert missing libs - fix bogus install inception - package to be remove anyway --- haskell-platform-minimal-binary.be0 | 91 ++++++++--------------------- 1 file changed, 24 insertions(+), 67 deletions(-) diff --git a/haskell-platform-minimal-binary.be0 b/haskell-platform-minimal-binary.be0 index 50503f625..bbdbac789 100755 --- a/haskell-platform-minimal-binary.be0 +++ b/haskell-platform-minimal-binary.be0 @@ -1,52 +1,22 @@ #!/usr/bin/env beesh -# BEE_VERSION haskell-platform-minimal-binary-8.0.1-0 +# BEE_VERSION haskell-platform-minimal-binary-8.0.1-1 -## this file was created by bee init and should be executed to build a -## bee-package. (Additional hints are located at the end of this file.) - -############################################################################### -## The source URL(s) define the location of the sources that will be -## downloaded. Version variables may be used to simplify reuse of this bee-file. - -SRCURL[0]="https://haskell.org/platform/download/$PKGVERSION/haskell-platform-${PKGVERSION}-unknown-posix--minimal-x86_64.tar.gz" - -############################################################################### -## Add URLs/pathes to patch files to the PATCHURL array. -## The sources will be patched in the order of the array. +#SRCURL[0]="https://haskell.org/platform/download/$PKGVERSION/haskell-platform-${PKGVERSION}-unknown-posix--minimal-x86_64.tar.gz" +SRCURL[0]="https://beehive.molgen.mpg.de/5fb7a85e2735b1268cd9617ba93f88ec/haskell-platform-8.0.1-unknown-posix--minimal-x86_64.tar.gz" # PATCHURL+=() -############################################################################### -## Add filename patterns to the EXCLUDE array of files that should not -## be added to you package but may be present in the image directory. - -# EXCLUDE+=() - -############################################################################### -## Uncomment the next statement, if the software may not be able to be built -## outside the source directory and needs to be built inside the source -## directory. - # build_in_sourcedir -############################################################################### -## bee cannot detect buildtypes specified in subdirectories. -## Sometimes packages "hide" the real sources in a subdirectory named -## 'src' or 'cmake' or .. -## use 'sourcesubdir_append' to specify this directory if known. - # sourcesubdir_append src - -############################################################################### -## Change the default (auto-detected) steps to -## extract, patch, configure/setup, build and install the software. -## Make sure the mee_install function does install everything to the -## image directory "${D}" - BEE_EXTRACT_STRIP=0 +mee_getsources_post() { + fetch_one_file "https://beehive.molgen.mpg.de/50f6a361ef3325f254885071f3bfb97a/ncurses_libs-5.7.tar" +} + #mee_extract() { # bee_extract "${@}" #} @@ -64,49 +34,36 @@ BEE_EXTRACT_STRIP=0 #} mee_install() { - start_cmd cd "$D" - start_cmd tar -x -f "$S/hp-usr-local.tar.gz" --no-same-owner + cd "$D" + tar -x -f "$S/hp-usr-local.tar.gz" --no-same-owner mkdir -p "$D$BINDIR" cd "$D/usr/local/haskell/ghc-$PKGVERSION-x86_64/bin" for f in *; do - start_cmd ln -s "/usr/local/haskell/ghc-$PKGVERSION-x86_64/bin/$f" "$D$BINDIR/" + ln -s "/usr/local/haskell/ghc-$PKGVERSION-x86_64/bin/$f" "$D$BINDIR/" done mkdir -p "$D$MANDIR/man1" cd "$D/usr/local/haskell/ghc-$PKGVERSION-x86_64/share/man/man1" for f in *; do - start_cmd ln -s "/usr/local/haskell/ghc-$PKGVERSION-x86_64/share/man/man1/$f" "$D$MANDIR/man1/" + ln -s "/usr/local/haskell/ghc-$PKGVERSION-x86_64/share/man/man1/$f" "$D$MANDIR/man1/" done mkdir -p "$D$DATAROOTIR/doc/" - start_cmd ln -s "/usr/local/haskell/ghc-$PKGVERSION-x86_64/share/doc/ghc" "$D$DATAROOTIR/doc/" + ln -s "/usr/local/haskell/ghc-$PKGVERSION-x86_64/share/doc/ghc" "$D$DATAROOTIR/doc/" + cd $D/usr/local/haskell/ghc-${PKGVERSION}-x86_64/lib/ghc-${PKGVERSION}/terminfo-0.4.0.2 + tar xvf $F/ncurses_libs-5.7.tar + + cp ${D}/usr/local/haskell/ghc-$PKGVERSION-x86_64/bin/ghc-pkg ${B}/ghc-pkg + sed -i 's#="/usr/local#="'$D'/usr/local#' ${B}/ghc-pkg + + cd ${D} for conf in "$D/usr/local/haskell/ghc-$PKGVERSION-x86_64/etc/registrations/"*; do - start_cmd \ - $D/usr/local/haskell/ghc-$PKGVERSION-x86_64/bin/ghc-pkg \ - --package-db $D/usr/local/haskell/ghc-$PKGVERSION-x86_64/lib/ghc-8.0.1/package.conf.d \ - register \ - $conf + # $D/usr/local/haskell/ghc-$PKGVERSION-x86_64/bin/ghc-pkg \ + ${B}/ghc-pkg \ + --package-db $D/usr/local/haskell/ghc-$PKGVERSION-x86_64/lib/ghc-8.0.1/package.conf.d \ + register \ + $conf done - } -## by default this may be 'make install DESTDIR="${D}"' - -############################################################################### -## -## Additional hints: -## -## The name of this bee-file should follow the following naming convention: -## pkgname-pkgversion-pkgrevision.bee -## -## You may remove all comments as long as SRCURL[${PKGVERSION}] is set. -## -## Everything in this file will be executed in a bash environment. -## -## Build the package by executing -## './pkg-version-N.bee' or -## 'beesh ./pkg-version-N.bee' -## -## see http://beezinga.org/ -##