cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

math/giacxcas: Update 1.6.0-7 -> 1.9.0-21

Browse Source 
The newly introduced bundled dependency micropython-1.12 causes
SEGV and it was disabled.
This commit is contained in:
Thierry Thomas 2022-09-22 23:47:30 -07:00 committed by Yuri Victorovich
parent e6dc355e79
commit d53f8e2377
12 changed files with 175 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
math/giacxcas/Makefile
View File

@ -1,6 +1,5 @@
PORTNAME= giacxcas
DISTVERSION= 1.6.0-7
PORTREVISION= 4
DISTVERSION= 1.9.0-21
CATEGORIES= math
MASTER_SITES= http://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/:giac \
http://cocoa.dima.unige.it/cocoalib/tgz/:cocoa \
@ -34,12 +33,14 @@ LIB_DEPENDS= libao.so:audio/libao \
libmpfi.so:math/mpfi \
libpari.so:math/pari \
libpng.so:graphics/png \
libnauty.so:math/nauty \
libcliquer.so:math/cliquer \
libsamplerate.so:audio/libsamplerate
RUN_DEPENDS= xdg-open:devel/xdg-utils
USES= blaslapack compiler:c++14-lang desktop-file-utils fortran \
gettext gl gmake gnome jpeg libtool localbase ncurses perl5 \
readline shebangfix xorg
python readline shebangfix xorg
GNU_CONFIGURE= yes
USE_GL= gl
USE_XORG= x11 xcursor xext xft xi xinerama
@ -54,7 +55,8 @@ CONFIGURE_ENV= ac_cv_lib_X11_main=yes \
ac_cv_lib_fltk_main=yes \
ac_cv_lib_fltk_images_main=yes \
ac_cv_lib_jpeg_main=yes
SHEBANG_FILES= src/pgiac
SHEBANG_FILES= src/pgiac micropython-1.12/docs/conf.py
INSTALL_TARGET= install-strip
COCOA_LIB_VERSION= 0.99700
@ -81,6 +83,7 @@ OPTIONS_DEFINE= DOCS EXAMPLES
#NB: built of giacxcas with USE_GCC and nlt is successfull if the ntl port is also
# installed with USE_GCC
CONFIGURE_ARGS+= --disable-ntl
CONFIGURE_ARGS+= --disable-micropy # it causes SEGV in xcas in the nlr_push call from execute_from_lexer@main.c
PORTDOCS= *
PORTEXAMPLES= *
@ -122,6 +125,13 @@ pre-configure:
.endfor
${FIND} ${WRKSRC}/doc -type f | ${XARGS} ${GREP} -l 'share/giac/doc' | \
${XARGS} ${REINPLACE_CMD} -e 's|/usr/local/share/giac/doc|${DOCSDIR}|'
${FIND} ${WRKSRC}/micropython-1.12 -type f | ${XARGS} \
${GREP} -l "/usr/bin/env python3" | ${XARGS} \
${REINPLACE_CMD} -e 's|/usr/bin/env python3|${PYTHON_CMD}|'
${FIND} ${WRKSRC}/micropython-1.12 -type f | ${XARGS} \
${GREP} -l "python3 \|'python3'\|= python3\|^python3" | ${XARGS} \
${REINPLACE_CMD} -e "s|python3 |${PYTHON_CMD} |;s|'python3'|'${PYTHON_CMD}'|" \
-e "s|= python3|= ${PYTHON_CMD}|;s|^python3|${PYTHON_CMD}|"
@(cd ${COCOALIB-GIAC} && ${SETENV} ${CONFIGURE_ENV} ./configure \
--with-cxx="${CXX}")
@(cd ${FLTKDEV-GIAC} && ${SETENV} ${CONFIGURE_ENV} ./configure \

6
math/giacxcas/distinfo
View File

@ -1,6 +1,6 @@
TIMESTAMP = 1594838401
SHA256 (giacxcas/giac_1.6.0-7.tar.gz) = 77d8df21e814c28c11bca41f15ceb9eed0ea7a0f4406dbe0ca80b27f46b86fdf
SIZE (giacxcas/giac_1.6.0-7.tar.gz) = 77157868
TIMESTAMP = 1663844960
SHA256 (giacxcas/giac_1.9.0-21.tar.gz) = 120cd16f2e033817302d2a03a22bd413dc1d85df8b225ba4f76b93a7805b07fe
SIZE (giacxcas/giac_1.9.0-21.tar.gz) = 103871108
SHA256 (giacxcas/CoCoALib-0.99700.tgz) = e9de0f4859946c8882414fc9f3756d5995961b0fcf6b477ac8e27636b41ca002
SIZE (giacxcas/CoCoALib-0.99700.tgz) = 5431651
SHA256 (giacxcas/fltk-giac.tar.gz) = 538243c536a62e562bc26dec1c54454f54ce614cc540371f5ccfe71d8ed27cf7

20
math/giacxcas/files/patch-micropython-1.12_py_dynruntime.mk Normal file
View File

@ -0,0 +1,20 @@
--- micropython-1.12/py/dynruntime.mk.orig 2020-04-13 05:21:17 UTC
+++ micropython-1.12/py/dynruntime.mk
@@ -24,8 +24,6 @@ CFLAGS += -std=c99
CFLAGS += -I. -I$(MPY_DIR)
CFLAGS += -std=c99
-CFLAGS += -Os
-CFLAGS += -Wall -Werror -DNDEBUG
CFLAGS += -DNO_QSTR
CFLAGS += -DMP_CONFIGFILE='<$(CONFIG_H)>'
CFLAGS += -fpic -fno-common
@@ -126,7 +124,7 @@ $(BUILD)/%.o: %.c $(CONFIG_H) Makefile
# Build .o from .c source files
$(BUILD)/%.o: %.c $(CONFIG_H) Makefile
$(ECHO) "CC $<"
- $(Q)$(CROSS)gcc $(CFLAGS) -o $@ -c $<
+ $(Q)$(CC) $(CFLAGS) -o $@ -c $<
# Build .mpy from .py source files
$(BUILD)/%.mpy: %.py

27
math/giacxcas/files/patch-micropython-1.12_py_mkenv.mk Normal file
View File

@ -0,0 +1,27 @@
--- micropython-1.12/py/mkenv.mk.orig 2020-04-13 05:21:17 UTC
+++ micropython-1.12/py/mkenv.mk
@@ -46,15 +46,15 @@ PYTHON = python3
TOUCH = touch
PYTHON = python3
-AS = $(CROSS_COMPILE)as
-CC = $(CROSS_COMPILE)gcc
-CXX = $(CROSS_COMPILE)g++
-GDB = $(CROSS_COMPILE)gdb
-LD = $(CROSS_COMPILE)ld
-OBJCOPY = $(CROSS_COMPILE)objcopy
-SIZE = $(CROSS_COMPILE)size
-STRIP = $(CROSS_COMPILE)strip
-AR = $(CROSS_COMPILE)ar
+#AS = $(CROSS_COMPILE)as
+#CC = $(CROSS_COMPILE)gcc
+#CXX = $(CROSS_COMPILE)g++
+#GDB = $(CROSS_COMPILE)gdb
+#LD = $(CROSS_COMPILE)ld
+#OBJCOPY = $(CROSS_COMPILE)objcopy
+#SIZE = $(CROSS_COMPILE)size
+#STRIP = $(CROSS_COMPILE)strip
+#AR = $(CROSS_COMPILE)ar
ifeq ($(MICROPY_FORCE_32BIT),1)
CC += -m32
CXX += -m32

15
math/giacxcas/files/patch-micropython-1.12_xcas_Makefile Normal file
View File

@ -0,0 +1,15 @@
--- micropython-1.12/xcas/Makefile.orig 2022-04-11 07:52:40 UTC
+++ micropython-1.12/xcas/Makefile
@@ -3,9 +3,9 @@ -include mpconfigport.mk
-include mpconfigport.mk
#PREFIX=/usr/bin/
-CC = $(PREFIX)gcc # gcc-4.7 works if gcc is gcc-4.4
-CXX = $(PREFIX)g++
-LD = $(PREFIX)ld
+#CC = $(PREFIX)gcc # gcc-4.7 works if gcc is gcc-4.4
+#CXX = $(PREFIX)g++
+#LD = $(PREFIX)ld
# define main target
PROG = libmicropython.a

11
math/giacxcas/files/patch-src_Editeur.cc Normal file
View File

@ -0,0 +1,11 @@
--- src/Editeur.cc.orig 2022-03-09 17:34:39 UTC
+++ src/Editeur.cc
@@ -2924,7 +2924,7 @@ namespace xcas {
Fl_Text_Buffer * b = new Fl_Text_Buffer;
editor=new Xcas_Text_Editor(x,y+L,w,h-L,b,l);
editor->Fl_Text_Display::textsize(labelsize());
- editor->Fl_Text_Display::linenumber_width(3*labelsize());
+ // editor->Fl_Text_Display::linenumber_width(3*labelsize());
editor->labelsize(labelsize());
log = 0;
if (logo){

11
math/giacxcas/files/patch-src_Makefile.in Normal file
View File

@ -0,0 +1,11 @@
--- src/Makefile.in.orig 2022-04-11 07:52:40 UTC
+++ src/Makefile.in
@@ -283,7 +283,7 @@ LIBOBJS = @LIBOBJS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
+LIBS = @LIBS@ @LIBINTL@
LIBTERMCAP = @LIBTERMCAP@
LIBTOOL = @LIBTOOL@
LIPO = @LIPO@

12
math/giacxcas/files/patch-src_icas.cc Normal file
View File

@ -0,0 +1,12 @@
--- src/icas.cc.orig 2022-04-11 07:52:40 UTC
+++ src/icas.cc
@@ -47,6 +47,9 @@ using namespace std;
//#include <unistd.h> // For reading arguments from file
#include <fcntl.h>
#include <cstdlib>
+#if defined(__FreeBSD__)
+#include <sys/wait.h>
+#endif
#include "gen.h"
#include "index.h"
#include "sym2poly.h"

11
math/giacxcas/files/patch-src_qjsgiac.c Normal file
View File

@ -0,0 +1,11 @@
--- src/qjsgiac.c.orig 2021-03-20 11:09:33 UTC
+++ src/qjsgiac.c
@@ -41,6 +41,8 @@
#include <malloc/malloc.h>
#elif defined(__linux__)
#include <malloc.h>
+#elif defined(__FreeBSD__)
+#include <malloc_np.h>
#endif
#ifdef NSPIRE_NEWLIB

24
math/giacxcas/files/patch-src_quickjs-libc.c Normal file
View File

@ -0,0 +1,24 @@
--- src/quickjs-libc.c.orig 2021-03-20 11:09:33 UTC
+++ src/quickjs-libc.c
@@ -58,8 +58,11 @@ char ** environ=&ptr;
char ** environ=&ptr;
#endif
-#if defined(__APPLE__)
+#if defined(__APPLE__) || defined(__FreeBSD__)
+extern char **environ;
typedef sig_t sighandler_t;
+#endif
+#if defined(__APPLE__)
#if !defined(environ)
#include <crt_externs.h>
#define environ (*_NSGetEnviron())
@@ -3613,6 +3616,8 @@ void js_std_set_worker_new_context_func(JSContext *(*f
#define OS_PLATFORM "darwin"
#elif defined(EMSCRIPTEN)
#define OS_PLATFORM "js"
+#elif defined(__FreeBSD__)
+#define OS_PLATFORM "freebsd"
#else
#define OS_PLATFORM "linux"
#endif

11
math/giacxcas/files/patch-src_quickjs.c Normal file
View File

@ -0,0 +1,11 @@
--- src/quickjs.c.orig 2021-03-23 12:33:15 UTC
+++ src/quickjs.c
@@ -41,6 +41,8 @@
#include <malloc/malloc.h>
#elif defined(__linux__)
#include <malloc.h>
+#elif defined(__FreeBSD__)
+#include <malloc_np.h>
#endif
#ifdef EMCC

16
math/giacxcas/pkg-plist
View File

@ -9,13 +9,16 @@ bin/pgiac
bin/xcas
bin/xcasnew
include/giac/alg_ext.h
include/giac/bf2gmp.h
include/giac/cocoa.h
include/giac/config.h
include/giac/csturm.h
include/giac/cutils.h
include/giac/derive.h
include/giac/desolve.h
include/giac/dispatch.h
include/giac/ezgcd.h
include/giac/fenv.h
include/giac/first.h
include/giac/fraction.h
include/giac/gauss.h
@ -37,11 +40,18 @@ include/giac/input_parser.h
include/giac/intg.h
include/giac/intgab.h
include/giac/isom.h
include/giac/js.h
include/giac/k_csdk.h
include/giac/k_defs.h
include/giac/kdisplay.h
include/giac/lexer_tab_int.h
include/giac/libbf.h
include/giac/libregexp-opcode.h
include/giac/libregexp.h
include/giac/libunicode-table.h
include/giac/libunicode.h
include/giac/lin.h
include/giac/list.h
include/giac/lpsolve.h
include/giac/maple.h
include/giac/markup.h
@ -60,7 +70,12 @@ include/giac/plot.h
include/giac/plot3d.h
include/giac/poly.h
include/giac/prog.h
include/giac/qjsgiac.h
include/giac/quater.h
include/giac/quickjs-atom.h
include/giac/quickjs-libc.h
include/giac/quickjs-opcode.h
include/giac/quickjs.h
include/giac/risch.h
include/giac/rpn.h
include/giac/series.h
@ -109,4 +124,5 @@ share/locale/fr/LC_MESSAGES/giac.mo
share/locale/it/LC_MESSAGES/giac.mo
share/locale/pt/LC_MESSAGES/giac.mo
share/locale/zh/LC_MESSAGES/giac.mo
share/metainfo/xcas.metainfo.xml
share/pixmaps/xcas.xpm