diff --git a/.gitignore b/.gitignore index b0df62e..2683467 100644 --- a/.gitignore +++ b/.gitignore @@ -31,17 +31,3 @@ /giac-1.9.0.35.tar.gz /giac-1.9.0.37.tar.gz /giac-1.9.0.57.tar.gz -/giac-1.9.0.59.tar.gz -/giac-1.9.0.61.tar.gz -/giac-1.9.0.63.tar.gz -/giac-1.9.0.69.tar.gz -/giac-1.9.0.73.tar.gz -/giac-1.9.0.91.tar.gz -/giac-1.9.0.97.tar.gz -/giac-1.9.0.99.tar.gz -/giac-1.9.0.992.tar.gz -/giac-1.9.0.993.tar.gz -/giac-1.9.0.998.tar.gz -/giac-1.9.0.999.tar.gz -/giac-2.0.0.17.tar.gz -/giac-2.0.0.18.tar.gz diff --git a/giac-1.9.0-fix_micropy_compiler_flags.patch b/giac-1.6.0-fix_micropy_compiler_flags.patch similarity index 57% rename from giac-1.9.0-fix_micropy_compiler_flags.patch rename to giac-1.6.0-fix_micropy_compiler_flags.patch index 7789d51..49ddd33 100644 --- a/giac-1.9.0-fix_micropy_compiler_flags.patch +++ b/giac-1.6.0-fix_micropy_compiler_flags.patch @@ -5,7 +5,7 @@ CWARN = -Wall -Werror CWARN += -Wpointer-arith -Wuninitialized -CFLAGS = $(INC) $(CWARN) -std=gnu99 -DUNIX $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA) -+CFLAGS = $(INC) $(CWARN) -DUNIX $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA) ${CFLAGS_FEDORA} -std=gnu99 ++CFLAGS = $(INC) $(CWARN) ${CFLAGS_FEDORA} -std=gnu99 -DUNIX $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA) # Debugging/Optimization ifdef DEBUG @@ -24,14 +24,14 @@ COPT = -g else -COPT = -g #-fomit-frame-pointer -flto -+COPT = -g ++COPT = ${CFLAGS_FEDORA} endif # compiler settings -CWARN = -Wall #-Werror -Wno-error=cpp -Wno-error=format -CFLAGS = -fPIC -DMICROPY_LIB $(INC) $(CWARN) -ansi -std=gnu99 $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA) +CWARN = -Wall -+CFLAGS = -fPIC -DMICROPY_LIB $(INC) $(CWARN) ${CFLAGS_FEDORA} -std=gnu99 $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA) ++CFLAGS = -fPIC -DMICROPY_LIB $(INC) $(CWARN) ${CFLAGS_FEDORA} -ansi -std=gnu99 $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA) @@ -40,40 +40,56 @@ # source files SRC_C = $(shell find . -name \*.c) ---- micropython-1.12/nspire/Makefile.orig 2020-04-30 09:52:40.000000000 +0200 -+++ micropython-1.12/nspire/Makefile 2020-10-21 14:02:09.081234972 +0200 +--- micropython-1.12/nspire/Makefile.nspire.orig 2020-04-30 09:52:40.000000000 +0200 ++++ micropython-1.12/nspire/Makefile.nspire 2020-10-21 14:02:09.081234972 +0200 @@ -31,14 +31,14 @@ ifdef DEBUG COPT = -O0 -g else -COPT = -Os -g #-fomit-frame-pointer -flto -+COPT = -g ++COPT = -g #-fomit-frame-pointer -flto endif # compiler settings - CWARN = -Wall -Werror -Wno-error=cpp -Wno-error=format -Wno-error=implicit-function-declaration --CFLAGS = -DMICROPY_LIB -mthumb-interwork $(INC) $(CWARN) -ansi -std=gnu99 $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA) -+CFLAGS = -DMICROPY_LIB -mthumb-interwork $(INC) $(CWARN) $(CFLAGS_FEDORA) -std=gnu99 $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA) + CWARN = -Wall -Werror -Wno-error=cpp -Wno-error=format +-CFLAGS = -DMICROPY_LIB $(INC) $(CWARN) -ansi -std=gnu99 $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA) ++CFLAGS = -DMICROPY_LIB $(INC) $(CWARN) ${CFLAGS_FEDORA} -ansi -std=gnu99 $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA) -LDFLAGS = $(LDFLAGS_MOD) -lm $(LDFLAGS_EXTRA) -Wl,--nspireio -+LDFLAGS = $(LDFLAGS_FEDORA) $(LDFLAGS_MOD) -lm $(LDFLAGS_EXTRA) -Wl,--nspireio ++LDFLAGS = ${LDFLAGS_FEDORA} $(LDFLAGS_MOD) -lm $(LDFLAGS_EXTRA) -Wl,--nspireio # source files SRC_C = $(shell find . -name \*.c) ---- micropython-1.12/numworks/Makefile.orig 2020-04-30 09:52:40.000000000 +0200 -+++ micropython-1.12/numworks/Makefile 2020-10-21 14:04:15.408648069 +0200 +--- micropython-1.12/numworks/Makefile.simu.orig 2020-04-30 09:52:40.000000000 +0200 ++++ micropython-1.12/numworks/Makefile.simu 2020-10-21 14:04:15.408648069 +0200 @@ -31,16 +31,16 @@ ifdef DEBUG COPT = -O0 -g else -COPT = -Ofast -g #-fomit-frame-pointer -flto -+COPT = -g ++COPT = -g #-fomit-frame-pointer -flto endif # compiler settings CWARN = -Wall -Werror -Wno-error=cpp -Wno-error=format -CFLAGS = -DNUMWORKS -DMICROPY_LIB $(INC) $(CWARN) -ansi -std=gnu99 $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA) -+CFLAGS = -DNUMWORKS -DMICROPY_LIB $(INC) $(CWARN) $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA) $(CFLAGS_FEDORA) -std=gnu99 ++CFLAGS = -DNUMWORKS -DMICROPY_LIB $(INC) $(CWARN) ${CFLAGS_FEDORA} -ansi -std=gnu99 $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA) + CFLAGS += -fdata-sections -ffunction-sections -fno-strict-aliasing -fno-exceptions # -fpermissive + + +-LDFLAGS = $(LDFLAGS_MOD) -lm $(LDFLAGS_EXTRA) ++LDFLAGS = ${LDFLAGS_FEDORA} $(LDFLAGS_MOD) -lm $(LDFLAGS_EXTRA) + + # source files + SRC_C = $(shell find . -name \*.c) +--- micropython-1.12/numworks/Makefile.numworks.orig 2020-04-30 09:52:40.000000000 +0200 ++++ micropython-1.12/numworks/Makefile.numworks 2020-10-21 14:06:40.454965360 +0200 +@@ -36,11 +36,11 @@ + + # compiler settings + CWARN = -Wall -Werror -Wno-error=cpp -Wno-error=format +-CFLAGS = -DNUMWORKS -DMICROPY_LIB $(INC) $(CWARN) -ansi -std=gnu99 $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA) ++CFLAGS = -DNUMWORKS -DMICROPY_LIB $(INC) $(CWARN) ${CFLAGS_FEDORA} -ansi -std=gnu99 $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA) CFLAGS += -mthumb -march=armv7e-m -mfloat-abi=hard -mcpu=cortex-m7 -mfpu=fpv5-sp-d16 -fdata-sections -ffunction-sections -fno-strict-aliasing -fno-exceptions # -fpermissive diff --git a/giac-delete-fenv.patch b/giac-delete-fenv.patch new file mode 100644 index 0000000..91de4e3 --- /dev/null +++ b/giac-delete-fenv.patch @@ -0,0 +1,23 @@ +diff -urN giac-1.9.0.orig/src/fenv.h giac-1.9.0/src/fenv.h +--- giac-1.9.0.orig/src/fenv.h 2021-03-20 12:09:36.000000000 +0100 ++++ giac-1.9.0/src/fenv.h 1970-01-01 01:00:00.000000000 +0100 +@@ -1,7 +0,0 @@ +-#ifndef FENV_H +-#define FENV_H +-#define FE_TONEAREST 0 +-#define FE_DOWNWARD 1 +-#define FE_UPWARD 2 +-#define PTHREAD_MUTEX_INITIALIZER 0 +-#endif +diff -urN giac-1.9.0.orig/src/Makefile.am giac-1.9.0/src/Makefile.am +--- giac-1.9.0.orig/src/Makefile.am 2022-04-11 09:52:40.000000000 +0200 ++++ giac-1.9.0/src/Makefile.am 2022-12-07 11:12:50.321144231 +0100 +@@ -30,7 +30,7 @@ + lexer_tab_int.h \ + static_help.h giacPCH.h giacintl.h gmp_replacements.h myostream.h \ + lpsolve.h optimization.h signalprocessing.h graphe.h graphtheory.h nautywrapper.h markup.h kdisplay.h k_csdk.h k_defs.h \ +-fenv.h libregexp.h libregexp-opcode.h libunicode.h libunicode-table.h \ ++libregexp.h libregexp-opcode.h libunicode.h libunicode-table.h \ + libbf.h list.h cutils.h qjsgiac.h \ + quickjs.h js.h quickjs-atom.h quickjs-libc.h quickjs-opcode.h bf2gmp.h + diff --git a/giac-faking_mkjs.patch b/giac-faking_mkjs.patch deleted file mode 100644 index 4978d74..0000000 --- a/giac-faking_mkjs.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/src/Makefile.orig.am 2024-05-13 08:25:27.000000000 +0200 -+++ b/src/Makefile.am 2024-07-16 21:37:38.681076855 +0200 -@@ -71,7 +71,7 @@ - ./mkjs - - mkjs: mkjs.cc -- g++ mkjs.cc -o mkjs -+ g++ mkjs.cc -o mkjs.fake - - AM_CPPFLAGS = -DIN_GIAC -I$(srcdir) -I$(top_srcdir) -I$(builddir) \ - -I$(top_builddir) $(GMP_CFLAGS) $(NTL_CFLAGS) \ ---- a/src/Makefile.orig.in 2024-05-23 17:09:52.000000000 +0200 -+++ b/src/Makefile.in 2024-07-16 21:36:49.122491632 +0200 -@@ -1470,7 +1470,7 @@ - ./mkjs - - mkjs: mkjs.cc -- g++ mkjs.cc -o mkjs -+ g++ mkjs.cc -o mkjs.fake - - install-exec-hook: - rm -f $(DESTDIR)$(bindir)/cas_help diff --git a/giac-makesrc.sh b/giac-makesrc.sh index e7cca4e..b86fa63 100755 --- a/giac-makesrc.sh +++ b/giac-makesrc.sh @@ -4,8 +4,8 @@ # package maintainer. # -VERSION="2.0.0" -VERSIONREV="18" +VERSION="1.9.0" +VERSIONREV="57" # The upstream tarball name is: giac"$SOURCEORIG".tar.gz SOURCEORIG=_"$VERSION"-"$VERSIONREV" @@ -20,11 +20,13 @@ if [ -f "$OUTPUTFILEBASENAME".tar.gz -o -f "$OUTPUTFILEBASENAME".tar.bz2 ] ; the fi echo >&2 "Build a temporary working dir" -mkdir -p giac-src -cd giac-src +TARGET=$(mkdir -p "giac-src") +ORIGDIR=`pwd` +cd "$TARGET" echo >&2 "Downloading upstream source ..." -wget "https://www-fourier.univ-grenoble-alpes.fr/~parisse/debian/dists/stable/main/source/giac$SOURCEORIG.tar.gz" +wget "http://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac$SOURCEORIG.tar.gz" + echo >&2 "Untar upstream source ..." tar -xzf giac"$SOURCEORIG".tar.gz @@ -58,10 +60,11 @@ touch html_vall echo >&2 "Building giac source tarball ..." cd ../../../ tar -cz giac-"$VERSION" -f "$OUTPUTFILEBASENAME".tar.gz -mv "giac"$OUTPUTFILEBASENAME".tar.gz" ../ -cd ../ + echo >&2 "Cleaning extracted dir ..." rm -rf giac-src +rm -f "giac$SOURCEORIG.tar.gz" +rm -rf giac-"$VERSION" echo >&2 "Finished." diff --git a/giac-undefine_GLIBCXX_ASSERTIONS.patch b/giac-undefine_GLIBCXX_ASSERTIONS.patch deleted file mode 100644 index 1b36832..0000000 --- a/giac-undefine_GLIBCXX_ASSERTIONS.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/src/first.orig.h 2023-05-24 09:52:40.000000000 +0200 -+++ b/src/first.h 2024-02-10 19:37:26.376884368 +0100 -@@ -27,12 +27,7 @@ - #endif - - // register is deprecated in c++17 --#define register -- -- --#ifdef _GLIBCXX_ASSERTIONS --#undef _GLIBCXX_ASSERTIONS --#endif -+#define register - - #if defined NUMWORKS && !defined SDL_KHICAS - #define KHICAS 1 ---- a/src/vecteur.orig.cc 2024-06-04 08:13:22.000000000 +0200 -+++ b/src/vecteur.cc 2024-11-01 17:58:56.061073533 +0100 -@@ -8498,15 +8498,15 @@ - } - else { - int C=col+1; -- longlong * ptr= &buffer[C],*ptrend=&buffer[0]+cmax-4; -- const int *ptrN=&Nline[C]; -+ longlong * ptr= &buffer[0]+C,*ptrend=&buffer[0]+cmax-4; -+ const int *ptrN=&Nline[0]+C; - for (;ptr