diff options
| -rw-r--r-- | system/opam/README | 14 | ||||
| -rw-r--r-- | system/opam/opam.SlackBuild | 26 | ||||
| -rw-r--r-- | system/opam/opam.info | 8 |
3 files changed, 29 insertions, 19 deletions
diff --git a/system/opam/README b/system/opam/README index 5b6d8a86909e3..9257895cd03c8 100644 --- a/system/opam/README +++ b/system/opam/README @@ -6,15 +6,15 @@ constraints, and a Git-friendly development workflow. Managing your OCaml installation can be as simple as: - opam list -a # List the available packages - opam install lwt # Install LWT - opam update # Update the package list + opam list -a # List the available packages + opam install lwt # Install LWT + opam update # Update the package list ... - opam upgrade # Upgrade installed packages to their latest version + opam upgrade # Upgrade the installed packages to their latest version -It has to be initialized. To do it, you can use the following command: +It has to be initialised. To do it, you can use the following command: opam init -It is not recommended to run opam as root. Apparently it installs -per-user packages. +It is not recommended to run opam as root. +Apparently it rather installs per-user packages. diff --git a/system/opam/opam.SlackBuild b/system/opam/opam.SlackBuild index ea4323275d4d0..e7d8270b0d5b9 100644 --- a/system/opam/opam.SlackBuild +++ b/system/opam/opam.SlackBuild @@ -22,7 +22,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=opam -VERSION=${VERSION:-1.2.2} +VERSION=${VERSION:-2.0.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -56,7 +56,7 @@ fi set -e rm -rf $PKG -mkdir -p $TMP $PKG $CWD +mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-full-$VERSION.tar.gz @@ -69,23 +69,33 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --build=$ARCH-slackware-linux + make lib-ext make make install DESTDIR=$PKG +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a AUTHORS CHANGES CONTRIBUTING.md LICENSE README.md \ $PKG/usr/doc/$PRGNAM-$VERSION +mv $PKG/usr/doc/opam-installer $PKG/usr/doc/$PRGNAM-$VERSION/opam-installer cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -# A file in the $PKG/usr/doc/$PRGNAM-$VERSION can be stripped, -# so we strip here, rather than immediately after make install. -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/system/opam/opam.info b/system/opam/opam.info index eac0737fa5bce..fd986517c79da 100644 --- a/system/opam/opam.info +++ b/system/opam/opam.info @@ -1,10 +1,10 @@ PRGNAM="opam" -VERSION="1.2.2" +VERSION="2.0.1" HOMEPAGE="https://opam.ocaml.org/" -DOWNLOAD="https://github.com/ocaml/opam/releases/download/1.2.2/opam-full-1.2.2.tar.gz" -MD5SUM="7d348c2898795e9f325fb80eaaf5eae8" +DOWNLOAD="https://github.com/ocaml/opam/releases/download/2.0.1/opam-full-2.0.1.tar.gz" +MD5SUM="24faa0ad049d146dfc3fcbe9cbab5eda" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="ocaml" +REQUIRES="ocaml bubblewrap" MAINTAINER="Roberto Metere" EMAIL="roberto@metere.it" |