diff options
| author | thierry <thierry@FreeBSD.org> | 2014-04-18 04:57:37 +0800 |
|---|---|---|
| committer | thierry <thierry@FreeBSD.org> | 2014-04-18 04:57:37 +0800 |
| commit | 9ce31e66cd2478c25c099bb1bf5c1d7f3cb13e54 (patch) | |
| tree | 9bc13b9f3e45035d50e6b41f0f78f58d4c954b97 /french/eficas | |
| parent | 70125968961e52269ac318b0e1774c8b18e5b23e (diff) | |
| download | freebsd-ports-gnome-9ce31e66cd2478c25c099bb1bf5c1d7f3cb13e54.tar.gz freebsd-ports-gnome-9ce31e66cd2478c25c099bb1bf5c1d7f3cb13e54.tar.zst freebsd-ports-gnome-9ce31e66cd2478c25c099bb1bf5c1d7f3cb13e54.zip | |
Unbreak with the work-around given by Vladimir Chukharev in PR ports/188114
untill math/py-numpy is fixed.
Diffstat (limited to 'french/eficas')
| -rw-r--r-- | french/eficas/Makefile | 6 | ||||
| -rw-r--r-- | french/eficas/files/patch-eficasQt | 13 |
2 files changed, 11 insertions, 8 deletions
diff --git a/french/eficas/Makefile b/french/eficas/Makefile index 03da26fd379d..1b17b00fe858 100644 --- a/french/eficas/Makefile +++ b/french/eficas/Makefile @@ -15,9 +15,8 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/Pmw:${PORTSDIR}/x11-toolkits/py-Pmw \ bash:${PORTSDIR}/shells/bash \ ${PYNUMPY} -BROKEN= ImportError in numpy: cannot import name scimath - USES= shebangfix +USE_GCC= yes # To be removed - Needed as a work-around for numpy, see PR ports/188114 USE_PYTHON= yes SHEBANG_FILES= eficas eficasQt REINPLACE_ARGS= -i "" @@ -50,7 +49,8 @@ pre-configure: ${REINPLACE_CMD} -e 's|/usr/bin|${LOCALBASE}/bin|' ${WRKSRC}/${FILE} .endfor ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|;s|%%PREFIX%%|${PREFIX}|' \ - -e 's|%%EFICASDIR%%|${EFICASDIR}|' ${WRKSRC}/eficasQt + -e 's|%%EFICASDIR%%|${EFICASDIR}|;s|%%GCC_RUNTIME%%|${_GCC_RUNTIME}|' \ + ${WRKSRC}/eficasQt do-install: ${MKDIR} ${STAGEDIR}${EFICASDIR} diff --git a/french/eficas/files/patch-eficasQt b/french/eficas/files/patch-eficasQt index 1612545be4f5..99b71ab2c281 100644 --- a/french/eficas/files/patch-eficasQt +++ b/french/eficas/files/patch-eficasQt @@ -1,6 +1,6 @@ ---- eficasQt.orig 2013-01-24 17:21:25.000000000 +0100 -+++ eficasQt 2013-03-16 16:07:04.000000000 +0100 -@@ -18,21 +18,16 @@ +--- eficasQt.orig 2014-04-17 22:44:45.000000000 +0200 ++++ eficasQt 2014-04-17 22:49:47.000000000 +0200 +@@ -18,21 +18,19 @@ # ============================================================================== set_prefix() { @@ -15,6 +15,9 @@ set_prefix $0 -export ASTER_ROOT=$prefix ++# Work-around for the py-numpy breakage - see PR ports/188114 ++FIXNUMPY=%%GCC_RUNTIME%% ++ +export ASTER_ROOT=%%LOCALBASE%%/aster # set environment -if [ -f /etc/codeaster/profile.sh ]; then @@ -27,10 +30,10 @@ fi # start Python interpreter -@@ -44,5 +39,5 @@ +@@ -44,5 +42,5 @@ PYTHONPATH=$PYTHONPATH:$EFICAS_ROOT/UiQT4 PYTHONPATH=$PYTHONPATH:$EFICAS_ROOT/Editeur -$PYTHONEXECUTABLE $eficasdir/Aster/qtEficas_aster.py $* -+$PYTHONEXECUTABLE $eficasdir/Aster/qtEficas_aster.pyo $* ++LD_LIBRARY_PATH=$FIXNUMPY $PYTHONEXECUTABLE $eficasdir/Aster/qtEficas_aster.pyo $* |