Mercurial > mxe-octave
changeset 6576:03860a88b499
librsb: Update to version 1.3.0.2
* src/librsb.mk: Update version and checksum. Build without Fortran compiler.
* src/librsb-1-setenv.patch, src/librsb-2-config.patch: Remove files.
* dist-files.mk: Remove deleted files from list.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Sun, 27 Nov 2022 19:08:31 +0100 |
| parents | 2778ec7dd467 |
| children | dc7335a5a446 |
| files | dist-files.mk src/librsb-1-setenv.patch src/librsb-2-config.patch src/librsb.mk |
| diffstat | 4 files changed, 3 insertions(+), 64 deletions(-) [+] |
line wrap: on
line diff
--- a/dist-files.mk Mon Dec 19 16:10:21 2022 +0100 +++ b/dist-files.mk Sun Nov 27 19:08:31 2022 +0100 @@ -294,8 +294,6 @@ libpng-test.c \ libpng.mk \ libproxy.mk \ - librsb-1-setenv.patch \ - librsb-2-config.patch \ librsb.mk \ librsvg-1-fixes.patch \ librsvg-test.c \
--- a/src/librsb-1-setenv.patch Mon Dec 19 16:10:21 2022 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +0,0 @@ ---- librsb-1.3.0.1/rsb_test_matops.c.orig 2022-02-24 11:11:02.000000000 +0100 -+++ librsb-1.3.0.1/rsb_test_matops.c 2022-10-15 13:44:55.920772450 +0200 -@@ -1979,7 +1979,7 @@ - RSB_STDOUT("# Memory benchmark took %.3lfs\n",dt); - } - --#ifdef RSB_HAVE_UNISTD_H -+#ifdef RSB_HAVE_SETENV - { - /* special environmental variables set just for the sake of being saved in .rpr files */ - #ifdef RSB_CC -@@ -6536,7 +6536,7 @@ - RSB_STDOUT("# Memory benchmark took %.3lfs\n",dt); - } - --#ifdef RSB_HAVE_UNISTD_H -+#ifdef RSB_HAVE_SETENV - { - /* special environmental variables set just for the sake of being saved in .rpr files */ - #ifdef RSB_CC -@@ -10962,7 +10962,7 @@ - RSB_STDOUT("# Memory benchmark took %.3lfs\n",dt); - } - --#ifdef RSB_HAVE_UNISTD_H -+#ifdef RSB_HAVE_SETENV - { - /* special environmental variables set just for the sake of being saved in .rpr files */ - #ifdef RSB_CC - - --- librsb-1.3.0.1/rsbench.c.orig 2022-10-15 13:54:32.053382000 +0200 -+++ librsb-1.3.0.1/rsbench.c 2022-10-15 13:54:58.038005553 +0200 -@@ -479,7 +479,15 @@ - { - const rsb_char_t *name=ava, *value=esp+1; - *esp=RSB_NUL; -+ #ifdef RSB_HAVE_SETENV - setenv(name, value, /*overwrite*/1); -+ #else -+ rsb_char_t buf[1000]; -+ strcpy(buf, name); -+ strcat(buf, "="); -+ strcat(buf, value); -+ putenv(buf); -+ #endif - RSBENCH_STDOUT("# Calling setenv() with arguments %s and %s\n",name,value); - } - if( ava ) -
--- a/src/librsb-2-config.patch Mon Dec 19 16:10:21 2022 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ ---- librsb-1.3.0.1/librsb-config.in.orig 2022-04-28 19:17:05.000000000 +0200 -+++ librsb-1.3.0.1/librsb-config.in 2022-10-15 14:10:34.827545946 +0200 -@@ -16,7 +16,7 @@ - includedir="@includedir@/" - ldflags="@LDFLAGS@" - # Note: if using -lrsbpp explicitly and -stdc++ is there, optional -lasan needs to precede -stdc++ (in RSB_RSBPP_LIBS) --libs="-lrsb" -+libs="-lrsb -lz" - extra_libs="@LIBS@ @OPENMP_CFLAGS@ @LIBRSB_MKL_LIBS@ @RSB_RSBPP_LIBS@" - all_libs="-lrsb" - fclibs="@FCLIBS@"
--- a/src/librsb.mk Mon Dec 19 16:10:21 2022 +0100 +++ b/src/librsb.mk Sun Nov 27 19:08:31 2022 +0100 @@ -3,8 +3,8 @@ PKG := librsb $(PKG)_IGNORE := -$(PKG)_VERSION := 1.3.0.1 -$(PKG)_CHECKSUM := c5781cfdd137a6d442318f9f5e7b9fd18c46d8c2 +$(PKG)_VERSION := 1.3.0.2 +$(PKG)_CHECKSUM := 61e23ad6258dba602fc3bcb3cdc4d1c1b24e220c $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$($(PKG)_FILE) @@ -25,6 +25,7 @@ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ + FC=' ' \ --disable-c-examples \ --disable-fortran-examples \ --disable-sparse-blas-interface \