[GRASS-SVN] r74476 - grass/branches/releasebranch_7_4

[svn_grass at osgeo.org]

Author: neteler
Date: 2019-05-10 03:26:42 -0700 (Fri, 10 May 2019)
New Revision: 74476

Modified:
   grass/branches/releasebranch_7_4/Dockerfile
Log:
gcc flag -march=native is evil in Dockerfile

Modified: grass/branches/releasebranch_7_4/Dockerfile
===================================================================
--- grass/branches/releasebranch_7_4/Dockerfile	2019-05-09 10:04:24 UTC (rev 74475)
+++ grass/branches/releasebranch_7_4/Dockerfile	2019-05-10 10:26:42 UTC (rev 74476)
@@ -73,8 +73,8 @@
 
 WORKDIR /code/grass
 
-# Set gcc/g++ environmental variables for GRASS GIS compilation, without debug symbols
-ENV MYCFLAGS "-O2 -march=native -std=gnu99 -m64"
+# Set gcc/g++ environment variables for GRASS GIS compilation, without debug symbols
+ENV MYCFLAGS "-O2 -std=gnu99 -m64"
 ENV MYLDFLAGS "-s"
 # CXX stuff:
 ENV LD_LIBRARY_PATH "/usr/local/lib"
@@ -103,8 +103,12 @@
     && make -j $NUMTHREADS && make install && ldconfig
 
 # enable simple grass command regardless of version number
-RUN ln -s /usr/local/bin/grass* /usr/local/bin/grass
+# Create generic GRASS GIS binary name regardless of version number
+RUN ln -sf `find /usr/local/bin -name "grass??" | sort | tail -n 1` /usr/local/bin/grass
+# Create a generic link to GRASS GIS libs
+RUN ln -s `grass --config path` /usr/local/grass7
 
+
 # Reduce the image size
 RUN apt-get autoremove -y
 RUN apt-get clean -y