diff options
author | Thierry Thomas <thierry@freebsd.org> | 2022-09-23 06:47:30 +0000 |
---|---|---|
committer | Yuri Victorovich <yuri@FreeBSD.org> | 2022-09-23 06:51:10 +0000 |
commit | d53f8e2377829d0cc9fa237e942481a763289e11 (patch) | |
tree | 0562714e7cfa284a2ce896a5788c788eac6f5b07 /math/giacxcas/files | |
parent | e6dc355e79244dfdd3d4d43f89fbf6eba73e77bd (diff) |
Diffstat (limited to 'math/giacxcas/files')
-rw-r--r-- | math/giacxcas/files/patch-micropython-1.12_py_dynruntime.mk | 20 | ||||
-rw-r--r-- | math/giacxcas/files/patch-micropython-1.12_py_mkenv.mk | 27 | ||||
-rw-r--r-- | math/giacxcas/files/patch-micropython-1.12_xcas_Makefile | 15 | ||||
-rw-r--r-- | math/giacxcas/files/patch-src_Editeur.cc | 11 | ||||
-rw-r--r-- | math/giacxcas/files/patch-src_Makefile.in | 11 | ||||
-rw-r--r-- | math/giacxcas/files/patch-src_icas.cc | 12 | ||||
-rw-r--r-- | math/giacxcas/files/patch-src_qjsgiac.c | 11 | ||||
-rw-r--r-- | math/giacxcas/files/patch-src_quickjs-libc.c | 24 | ||||
-rw-r--r-- | math/giacxcas/files/patch-src_quickjs.c | 11 |
9 files changed, 142 insertions, 0 deletions
diff --git a/math/giacxcas/files/patch-micropython-1.12_py_dynruntime.mk b/math/giacxcas/files/patch-micropython-1.12_py_dynruntime.mk new file mode 100644 index 000000000000..66f09b1c0b30 --- /dev/null +++ b/math/giacxcas/files/patch-micropython-1.12_py_dynruntime.mk @@ -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 diff --git a/math/giacxcas/files/patch-micropython-1.12_py_mkenv.mk b/math/giacxcas/files/patch-micropython-1.12_py_mkenv.mk new file mode 100644 index 000000000000..f2598ec00531 --- /dev/null +++ b/math/giacxcas/files/patch-micropython-1.12_py_mkenv.mk @@ -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 diff --git a/math/giacxcas/files/patch-micropython-1.12_xcas_Makefile b/math/giacxcas/files/patch-micropython-1.12_xcas_Makefile new file mode 100644 index 000000000000..016f0ef3a2b8 --- /dev/null +++ b/math/giacxcas/files/patch-micropython-1.12_xcas_Makefile @@ -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 diff --git a/math/giacxcas/files/patch-src_Editeur.cc b/math/giacxcas/files/patch-src_Editeur.cc new file mode 100644 index 000000000000..767730070f9d --- /dev/null +++ b/math/giacxcas/files/patch-src_Editeur.cc @@ -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){ diff --git a/math/giacxcas/files/patch-src_Makefile.in b/math/giacxcas/files/patch-src_Makefile.in new file mode 100644 index 000000000000..426f193d3f31 --- /dev/null +++ b/math/giacxcas/files/patch-src_Makefile.in @@ -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@ diff --git a/math/giacxcas/files/patch-src_icas.cc b/math/giacxcas/files/patch-src_icas.cc new file mode 100644 index 000000000000..8a6b89ec23b9 --- /dev/null +++ b/math/giacxcas/files/patch-src_icas.cc @@ -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" diff --git a/math/giacxcas/files/patch-src_qjsgiac.c b/math/giacxcas/files/patch-src_qjsgiac.c new file mode 100644 index 000000000000..12b21992bc60 --- /dev/null +++ b/math/giacxcas/files/patch-src_qjsgiac.c @@ -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 diff --git a/math/giacxcas/files/patch-src_quickjs-libc.c b/math/giacxcas/files/patch-src_quickjs-libc.c new file mode 100644 index 000000000000..34ba89847a41 --- /dev/null +++ b/math/giacxcas/files/patch-src_quickjs-libc.c @@ -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 diff --git a/math/giacxcas/files/patch-src_quickjs.c b/math/giacxcas/files/patch-src_quickjs.c new file mode 100644 index 000000000000..c330699c7c28 --- /dev/null +++ b/math/giacxcas/files/patch-src_quickjs.c @@ -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 |