Merge branch 'develop' into 'master'

Merge branch 'develop' into 'master' See merge request Scientific-IT-Systems/gr!1368
sciapp · Dec 17, 2024 · 9e61244 · 9e61244
2 parents 8a4e4bc + 9fac4e4
commit 9e61244
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 10 deletions.
diff --git a/.gitlab-ci/deploy.yml b/.gitlab-ci/deploy.yml
@@ -24,10 +24,10 @@ deploy-to-obs:
     mv -f ${OBS_PROJECT}/gr/_service.new
     ${OBS_PROJECT}/gr/_service
   - osc commit ${OBS_PROJECT}/gr/_service -m "Release $REVISION"
-  - fails=`osc results -w -f -F ${OBS_PROJECT}/gr`
-    if [ -z "${fails}" ]; then
-      echo "$fails"
-      exit 1
+  - fails="$(osc results -w -f -F ${OBS_PROJECT}/gr)"
+  - if [[ -n "${fails}" ]]; then
+      echo "$fails";
+      exit 1;
     fi
 
 deploy-to-aur:

diff --git a/lib/gks/Makefile b/lib/gks/Makefile
@@ -37,7 +37,7 @@ else
 GR_SHARED_LIBRARY_SUFFIX ?= .so
 INSTALL_NAME =
      LDFLAGS = $(EXTRA_LDFLAGS) -Wl,-rpath,'$$ORIGIN/.'
-     SOFLAGS = -shared
+     SOFLAGS = -shared -Wl,-soname,$@
 endif
         LIBS = -lpthread -ldl -lc -lm
       FTDEFS =

diff --git a/lib/gks/plugin/Makefile b/lib/gks/plugin/Makefile
@@ -11,6 +11,9 @@ endif
    CXXFLAGS = -O -Wall -Wextra -pedantic -Wno-deprecated-copy -fPIC $(EXTRA_CXXFLAGS) # -Wno-deprecated-copy to avoid warnings from wx headers
    INCLUDES = -I.. -I$(THIRDPARTYDIR)/include
     SOFLAGS = -shared
+ifeq ($(UNAME),Linux)
+    SOFLAGS += -Wl,-soname,$@
+endif
     LDFLAGS = $(EXTRA_LDFLAGS)
 ifeq ($(UNAME),Darwin)
 	 CFLAGS += -mmacosx-version-min=10.15

diff --git a/lib/gr/Makefile b/lib/gr/Makefile
@@ -29,7 +29,7 @@ else
 GR_SHARED_LIBRARY_SUFFIX ?= .so
 INSTALL_NAME =
      LDFLAGS = $(EXTRA_LDFLAGS) -Wl,-rpath,'$$ORIGIN/.'
-     SOFLAGS = -shared
+     SOFLAGS = -shared -Wl,-soname,$@
 endif
         LIBS = -lpthread -ldl -lc -lm
     JPEGLIBS = $(THIRDPARTYDIR)/lib/libjpeg.a

diff --git a/lib/gr/qtgr/Makefile b/lib/gr/qtgr/Makefile
@@ -5,6 +5,9 @@ UNAME_S := $(shell uname -s)
 
 CFLAGS = -O3 -Wall -fPIC $(EXTRA_CFLAGS)
 LDFLAGS = $(EXTRA_LDFLAGS)
+ifeq ($(UNAME_S),Linux)
+LDFLAGS += -Wl,-soname,$@
+endif
 
 
 ifeq ($(UNAME_S),Darwin)

diff --git a/lib/gr3/Makefile b/lib/gr3/Makefile
@@ -33,7 +33,7 @@ PLATFORMLIBS = -lX11 -lGL
         OBJS+= gr3_glx.o
 INSTALL_NAME =
      LDFLAGS = $(EXTRA_LDFLAGS) -Wl,-rpath,'$$ORIGIN/.'
-     SOFLAGS = -shared
+     SOFLAGS = -shared -Wl,-soname,$@
         LIBS = -ldl
 endif
 

diff --git a/lib/grm/Makefile b/lib/grm/Makefile
@@ -79,7 +79,7 @@ else
 GR_SHARED_LIBRARY_SUFFIX ?= .so
 INSTALL_NAME =
      LDFLAGS = $(EXTRA_LDFLAGS) -Wl,-rpath,'$$ORIGIN/.'
-     SOFLAGS = -shared
+     SOFLAGS = -shared -Wl,-soname,$@
 endif
       GRLIBS = -L ../gr/ -lGR
      GR3LIBS = -L ../gr3/ -lGR3

diff --git a/lib/grm/src/grm/import.cxx b/lib/grm/src/grm/import.cxx
@@ -1330,7 +1330,7 @@ int grm_interactive_plot_from_file(grm_args_t *args, int argc, char **argv)
                     }
                 }
               // special case for barplot and histogram cause the x-values and bar_width gets calculated via x_range_min
-              // and max; without the following code block all series will allways have the same x and same width
+              // and max; without the following code block all series will always have the same x and same width
               if (str_equals_any(kind, "barplot", "histogram"))
                 {
                   for (col = 0; col < x_data.size(); ++col)
@@ -1520,7 +1520,7 @@ int grm_interactive_plot_from_file(grm_args_t *args, int argc, char **argv)
     {
       if (cols % 2 == 1)
         {
-          fprintf(stderr, "For polar_line and polar_scatter plots x and y must allways be given, but in this case the "
+          fprintf(stderr, "For polar_line and polar_scatter plots x and y must always be given, but in this case the "
                           "number of columns is odd -> 1 column is missing.\n");
           cols -= 1;
         }