Skip to content

Commit

Permalink
gap v4.12.2 (#68)
Browse files Browse the repository at this point in the history
automerged PR by conda-forge/automerge-action
  • Loading branch information
github-actions[bot] authored Apr 8, 2023
2 parents 8b01bec + 6d21918 commit 653a189
Show file tree
Hide file tree
Showing 14 changed files with 130 additions and 191 deletions.
7 changes: 0 additions & 7 deletions .ci_support/migrations/pari215.yaml

This file was deleted.

4 changes: 2 additions & 2 deletions .scripts/build_steps.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .scripts/run_osx_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 0 additions & 15 deletions recipe/0000-cross-build-package.patch

This file was deleted.

49 changes: 0 additions & 49 deletions recipe/0001-Use-a-standard-autotools-setup.patch

This file was deleted.

74 changes: 2 additions & 72 deletions recipe/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,50 +2,12 @@

set -x

pushd pkg/CaratInterface
tar pzxf carat.tgz
popd

# Get an updated config.sub, config.guess and libtool
for f in $(find $SRC_DIR -name config.sub); do
cp $BUILD_PREFIX/share/gnuconfig/config.sub $f
done
for f in $(find $SRC_DIR -name config.guess); do
cp $BUILD_PREFIX/share/gnuconfig/config.guess $f
done
for f in $(find $SRC_DIR -name libtool); do
cp $BUILD_PREFIX/bin/libtool $f
done
for f in $(find $SRC_DIR -name libtool.m4); do
cp $BUILD_PREFIX/share/aclocal/libtool.m4 $f
pushd $(dirname $(dirname $f))
autoreconf -vfi || true
popd
done

autoreconf -vfi

export LD_LIBRARY_PATH="$PREFIX/lib:$LD_LIBRARY_PATH"
export CFLAGS="-g -O3 -fPIC $CFLAGS"
rm -f $BUILD_PREFIX/bin/curl-config

# Following is adapted from https://github.com/sagemath/sage

# Delete PDF documentation and misc TeX files
find doc \( \
-name "*.bbl" \
-o -name "*.blg" \
-o -name "*.aux" \
-o -name "*.dvi" \
-o -name "*.idx" \
-o -name "*.ilg" \
-o -name "*.l*" \
-o -name "*.m*" \
-o -name "*.pdf" \
-o -name "*.ind" \
-o -name "*.toc" \
\) -exec rm {} \;

shopt -s extglob

# Stuff that isn't GAP sources:
Expand All @@ -62,8 +24,6 @@ if [[ "$target_platform" != "$build_platform" ]]; then
fi
fi

chmod +x configure

./configure \
--prefix="$PREFIX" PREFIX="$PREFIX" \
--with-gmp="$PREFIX" \
Expand All @@ -75,41 +35,11 @@ make
cd pkg

# Disable problematic packages. See https://github.com/conda-forge/gap-feedstock/pull/16
# anupq, cohomolo because of duplicate symbols
for GAP_PKG_NAME in anupq cohomolo xgap polymakeinterface;
do
PKG_DIR=`find . -maxdepth 1 -iname "$GAP_PKG_NAME-*" -type d`
rm -rf $PKG_DIR
done

if [[ -d NormalizInterface-1.1.0 ]]; then
curl -L -O https://github.com/gap-packages/NormalizInterface/releases/download/v1.2.0/NormalizInterface-1.2.0.tar.gz
tar -zxvf NormalizInterface-1.2.0.tar.gz
rm NormalizInterface-1.2.0.tar.gz
rm -rf NormalizInterface-1.1.0
fi

ACE_PKG_DIR=`find . -maxdepth 1 -iname "ace-*" -or -iname "ace" -type d`
pushd $ACE_PKG_DIR
sed -i.bak "s/CC=/CC?=/g" Makefile.in
popd

for pkg in DeepThought nq simpcomp; do
VERSION_PKG_DIR=`find . -maxdepth 1 -iname "$pkg-*" -or -iname "$pkg" -type d`
pushd $VERSION_PKG_DIR
if [[ "$target_platform" == osx-* ]]; then
mv VERSION .VERSION || true
sed -i.bak "s/< VERSION/< .VERSION/g" configure.ac || true
sed -i.bak "s@$(top_srcdir)/VERSION@$(top_srcdir)/.VERSION@g" || true
autoreconf -vfi
fi
popd
done
rm -rf xgap

sed -i.bak "s@./build-normaliz.sh@echo@g" ../bin/BuildPackages.sh
bash ../bin/BuildPackages.sh \
--add-package-config-Semigroups "--with-external-libsemigroups --without-march-native" \
--add-package-config-Digraphs "--with-external-bliss --with-external-planarity --without-intrinsics"
--add-package-config-Digraphs "--with-external-bliss --with-external-planarity --without-intrinsics" \

# Print error logs
mkdir -p log
Expand Down
24 changes: 7 additions & 17 deletions recipe/install-core.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#!/bin/bash

INSTALL_DIR="$PREFIX/share/gap"

mkdir -p "$INSTALL_DIR"

make install-headers install-libgap
cp gen/config.h $PREFIX/include/gap
make install

set +e
pushd pkg
Expand All @@ -22,24 +23,13 @@ popd
echo "done"
set -e

cp -R * "$INSTALL_DIR"
rm -rf "$INSTALL_DIR/obj"
rm -rf "$INSTALL_DIR/pkg"
rm "$INSTALL_DIR"/conda_build.sh
cp "$RECIPE_DIR/gap.sh" "$PREFIX/bin/gap"
chmod +x "$PREFIX/bin/gap"

GAP_SRC_PATH=`ls -d "$INSTALL_DIR"/bin/*/src`
rm "$GAP_SRC_PATH"
ln -s "$INSTALL_DIR"/src/ "$GAP_SRC_PATH"

mkdir -p "$INSTALL_DIR/pkg"
cd pkg
for GAP_PKG_NAME in smallgrp transgrp primgrp gapdoc;
do
PKG_DIR=`find . -maxdepth 1 -iname "$GAP_PKG_NAME-*" -o -iname "$GAP_PKG_NAME" -type d`
echo "GAP_PKG_NAME: $GAP_PKG_NAME"
echo "PKG_DIR: $PKG_DIR"
ls -al .
mv $PKG_DIR $INSTALL_DIR/pkg/$PKG_DIR
mv $GAP_PKG_NAME $INSTALL_DIR/pkg/$GAP_PKG_NAME
done

# Delete doc for agt (we do not ship docs and these contain broken symlinks.)
rm -rf $INSTALL_DIR/pkg/agt/doc
26 changes: 14 additions & 12 deletions recipe/install-defaults.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,23 @@ echo "done"
set -e

for pkg in atlasrep \
autpgrp-* \
alnuth-* \
crisp-* \
ctbllib-* \
FactInt-* \
autpgrp \
alnuth \
crisp \
ctbllib \
factint \
fga \
irredsol-* \
laguna-* \
polenta-* \
polycyclic-* \
resclasses-* \
sophus-* \
tomlib-* ; do
irredsol \
laguna \
polenta \
polycyclic \
resclasses \
sophus \
tomlib ; do
mv $pkg $INSTALL_DIR/pkg/$pkg
done

popd

# Delete doc for agt (we do not ship docs and these contain broken symlinks.)
rm -rf $INSTALL_DIR/pkg/agt/doc
5 changes: 4 additions & 1 deletion recipe/install-full.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ set -e

mv pkg $INSTALL_DIR/pkg

pushd $INSTALL_DIR/pkg/JupyterKernel-*/
pushd $INSTALL_DIR/pkg/jupyterkernel/
sed -i.bak "s@ GAP=gap@ GAP=$PREFIX/bin/gap@g" bin/jupyter-kernel-gap
rm bin/jupyter-kernel-gap.bak
rm setup.py
Expand All @@ -31,3 +31,6 @@ cp $RECIPE_DIR/gap-mode.json etc/
python -m pip install . --no-deps
rm -rf $SP_DIR/gap_jupyter-*
popd

# Delete doc for agt (we do not ship docs and these contain broken symlinks.)
rm -rf $INSTALL_DIR/pkg/agt/doc
19 changes: 9 additions & 10 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% set version = "4.11.1" %}
{% set version = "4.12.2" %}
{% set name = "gap-split" %}

package:
Expand All @@ -7,14 +7,14 @@ package:

source:
url: https://github.com/gap-system/gap/releases/download/v{{ version }}/gap-{{ version }}.tar.gz
sha256: 6635c5da7d82755f8339486b9cac33766f58712f297e8234fba40818902ea304
sha256: 672308745eb78a222494ee8dd6786edd5bc331456fcc6456ac064bdb28d587a8
patches:
- 0000-cross-build-package.patch
# Upstream issue: https://github.com/gap-system/gap/issues/5383
- 0001-Use-a-standard-autotools-setup.patch
- patches/0001-Allow-cross-building-packages.patch
- patches/0001-Do-not-run-prerequisites.sh.patch
- patches/0001-Do-not-install-documentation.patch

build:
number: 5
number: 0
skip: true # [win]

requirements:
Expand All @@ -24,7 +24,6 @@ requirements:
- make
- pkg-config
- curl
- autoconf
- automake
- libtool
host:
Expand Down Expand Up @@ -77,7 +76,7 @@ outputs:
- {{ pin_subpackage('gap-core', exact=True) }}
test:
commands:
- echo "TODO - test a package here"
- echo 'if LoadPackage("smallgrp") = fail then QUIT_GAP(1); else QUIT_GAP(0); fi;' | gap

- name: gap
script: install-full.sh
Expand Down Expand Up @@ -135,15 +134,15 @@ outputs:
- {{ pin_subpackage('gap-defaults', exact=True) }}
test:
commands:
- echo "TODO - test a package here"
- echo 'if LoadPackage("alnuth") = fail then QUIT_GAP(1); else QUIT_GAP(0); fi;' | gap

about:
home: https://www.gap-system.org/
license: GPL-2.0-or-later
license_file: LICENSE
summary: GAP - Groups, Algorithms, Programming, a System for Computational Discrete Algebra
dev_url: https://github.com/gap-system/gap
doc_url: https://www.gap-system.org/Manuals/doc/ref/chap0.html
doc_url: https://docs.gap-system.org/doc/ref/chap0_mj.html

extra:
recipe-maintainers:
Expand Down
Loading

0 comments on commit 653a189

Please sign in to comment.