瀏覽代碼

docker alpine: removed gisinit revision workaround (#280)

* docker alpine: removed gisinit revision workaround

gisinit revision patch in #278 obsoleted by ec9b6f24b3bfaf657ebf4ae67d95ffe197d10d9b

See: https://trac.osgeo.org/grass/ticket/3880

(also improves #117)
Markus Neteler 5 年之前
父節點
當前提交
3d527cd493
共有 2 個文件被更改,包括 0 次插入35 次删除
  1. 0 2
      docker/alpine/Dockerfile_alpine
  2. 0 33
      docker/alpine/alpine-py38-gisinit.patch

+ 0 - 2
docker/alpine/Dockerfile_alpine

@@ -161,9 +161,7 @@ COPY . /src/grass_build/
 WORKDIR /src/grass_build/
 # PATCH ctypes
 COPY docker/alpine/alpine-py38-ctypes.patch /src/alpine-py38-ctypes.patch
-COPY docker/alpine/alpine-py38-gisinit.patch /src/alpine-py38-gisinit.patch
 RUN patch -p1 < /src/alpine-py38-ctypes.patch
-RUN patch -p1 < /src/alpine-py38-gisinit.patch
 
 # Configure compile and install GRASS GIS
 RUN echo "  => Configure and compile grass" && \

+ 0 - 33
docker/alpine/alpine-py38-gisinit.patch

@@ -1,33 +0,0 @@
-diff --git a/lib/gis/gisinit.c b/lib/gis/gisinit.c
-index c45a9eb15..1531d18da 100644
---- a/lib/gis/gisinit.c
-+++ b/lib/gis/gisinit.c
-@@ -49,12 +49,12 @@ void G__gisinit(const char *version, const char *pgm)
- 
-     G_set_program_name(pgm);
- 
--    if (strcmp(version, GIS_H_VERSION) != 0)
-+    /*if (strcmp(version, GIS_H_VERSION) != 0)
- 	G_fatal_error(_("Module built against version %s but "
- 			"trying to use version %s. "
- 			"You need to rebuild GRASS GIS or untangle multiple installations."),
-                         version, GIS_H_VERSION);
--    
-+    */
-     /* Make sure location and mapset are set */
-     G_location_path();
-     mapset = G_mapset();
-@@ -83,11 +83,12 @@ void G__no_gisinit(const char *version)
-     if (initialized)
- 	return;
- 
--    if (strcmp(version, GIS_H_VERSION) != 0)
-+    /*if (strcmp(version, GIS_H_VERSION) != 0)
- 	G_fatal_error(_("Module built against version %s but "
- 			"trying to use version %s. "
- 			"You need to rebuild GRASS GIS or untangle multiple installations."),
-                         version, GIS_H_VERSION);
-+    */
-     gisinit();
- }
-