diff --git a/Vagrantfile b/Vagrantfile index 2ece6c417c4..035bb0c64cb 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -13,10 +13,10 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| vm_ram = ENV['VAGRANT_VM_RAM'] || 1024 vm_cpu = ENV['VAGRANT_VM_CPU'] || 1 - config.vm.box = "bionic64" + config.vm.box = "noble64" config.vm.hostname = "grass-gis-vagrant" - config.vm.box_url = "https://cloud-images.ubuntu.com/bionic/current/bionic-server-cloudimg-amd64-vagrant.box" + config.vm.box = "alvistack/ubuntu-24.04" config.vm.define "grass-gis-vagrant" do |host| config.vm.network :forwarded_port, guest: 80, host: 8080 @@ -36,11 +36,12 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # host.vm.synced_folder grassdata_dir, "/home/vagrant/grassdata" ppaRepos = [ - "ppa:ubuntugis/ubuntugis-unstable" + # TODO: enable PPA & PDAL support when available + # "ppa:ubuntugis/ubuntugis-unstable" ] packageList = [ - "autoconf2.13", + "autoconf2.69", "autotools-dev", "make", "g++", @@ -77,7 +78,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| "liblapack-dev", "unixodbc-dev", "zlib1g-dev", - "liblas-c-dev" + # "libpdal-dev" ] unless File.exists?(".no_apt_cache") @@ -88,7 +89,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| if Dir.glob("#{File.dirname(__FILE__)}/.vagrant/machines/grass-gis-vagrant/*/id").empty? pkg_cmd = "sed -i 's#deb http://archive.ubuntu.com/ubuntu#deb mirror://mirrors.ubuntu.com/mirrors.txt#' /etc/apt/sources.list; " - pkg_cmd << "apt-get update -qq; apt-get install -q -y python-software-properties; " + pkg_cmd << "apt-get update -qq; apt-get install -q -y python3-software-properties; " if ppaRepos.length > 0 ppaRepos.each { |repo| pkg_cmd << "add-apt-repository -y " << repo << " ; " } diff --git a/utils/vagrant/compile.sh b/utils/vagrant/compile.sh index 1f620fced5c..058eb70b1f9 100755 --- a/utils/vagrant/compile.sh +++ b/utils/vagrant/compile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash ### inspired by https://github.com/OSGeo/gdal/blob/master/gdal/scripts/vagrant/gdal.sh @@ -21,7 +21,6 @@ if [ ! -f "include/Make/Platform.make" ] ; then --bindir=/usr/bin \ --srcdir=/vagrant \ --prefix=/usr/lib \ - --enable-socket \ --enable-shared \ --with-postgres \ --with-mysql \ @@ -30,7 +29,6 @@ if [ ! -f "include/Make/Platform.make" ] ; then --with-gdal \ --with-geos \ --with-freetype \ - --with-motif \ --with-readline \ --with-nls \ --with-odbc \ @@ -43,9 +41,10 @@ if [ ! -f "include/Make/Platform.make" ] ; then --with-postgres-includes=`pg_config --includedir` \ --with-mysql-includes=`mysql_config --include | sed -e 's/-I//'` \ --with-proj-share=/usr/share/proj \ - --with-python \ --with-cairo \ - --with-liblas + --with-pthread \ + --with-bzlib \ + --without-pdal fi make -j $NUMTHREADS