[Mesa-dev] [PATCH mesa] drop autotools

Eric Engestrom eric.engestrom at intel.com
Mon Dec 3 17:34:08 UTC 2018


On Monday, 2018-12-03 08:59:48 -0800, Eric Anholt wrote:
> Eric Anholt <eric at anholt.net> writes:
> 
> > [ Unknown signature status ]
> > Eric Engestrom <eric.engestrom at intel.com> writes:
> >
> >> Cc: Emil Velikov <emil.l.velikov at gmail.com>
> >> Cc: Andres Gomez <agomez at igalia.com>
> >> Cc: Juan A. Suarez Romero <jasuarez at igalia.com>
> >> Cc: Dylan Baker <dylan at pnwbakers.com>
> >> Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
> >> ---
> >> This patch depends on the releasing procedure in docs/releasing.html to
> >> be updated to not rely on autotools anymore.
> >>
> >> I think our release managers (cc'ed) should work together and figure out
> >> the procedure they want to go by; only once that's done can we delete
> >> these 200+ files and 14k+ lines :)
> >> ---
> >
> >> diff --git a/docs/relnotes/19.0.0.html b/docs/relnotes/19.0.0.html
> >> index 1b839b0a485fec867375..9e8a34fbe1b150e6b9d4 100644
> >> --- a/docs/relnotes/19.0.0.html
> >> +++ b/docs/relnotes/19.0.0.html
> >> @@ -51,7 +51,12 @@ <h2>Bug fixes</h2>
> >>  <h2>Changes</h2>
> >>  
> >>  <ul>
> >> -<li>TBD</li>
> >> +  <li>
> >> +    The autools build system has been removed. Please follow the
> >> +    instruction on <a href="https://mesa3d.org/meson.html">the meson
> >
> > "instructions"

Yeah, plural works better :)
Fixed locally.

> >
> >> +    page</a> if you need help, or reach out on <a
> >> +    href="https://mesa3d.org/lists.html">the mailing list</a>.
> >> +  </li>
> >>  </ul>
> >>  
> >>  </div>
> >
> >> diff --git a/src/util/xmlpool/.gitignore b/src/util/xmlpool/.gitignore
> >> index 383df727a17031214dee..db5b642826e990a5523c 100644
> >> --- a/src/util/xmlpool/.gitignore
> >> +++ b/src/util/xmlpool/.gitignore
> >> @@ -1,8 +1 @@
> >> -ca
> >> -de
> >> -es
> >> -fr
> >> -nl
> >> -sv
> >> -options.h
> >>  xmlpool.pot
> >
> > Shouldn't xmlpool.pot also go away?

I'm not entirely sure what this file does, but it does live in the tree
and Android.mk uses it, wheras Meson re-generates it on demand
(`ninja xmlpool.pot`), so we can either change Android to not use this
file anymore and delete it (and this line), or keep it as is.
Not knowing more I decided to just leave it as is :)

> >
> > Other than that,
> >
> > Reviewed-by: Eric Anholt <eric at anholt.net>
> 
> Oh, we should probably at least disable the autotools tests in
> .travis.yml until they can be converted to meson.

Oh, good point, I forgot those. I think most of them can go, but for now
I just added the following to this commit:

----8<----
diff --git a/.travis.yml b/.travis.yml
index 7b70f3110d9898610765..19f8b23b413b482f1884 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -654,27 +290,6 @@ install:
     fi
 
 script:
-  - if test "x$BUILD" = xmake; then
-      test -n "$OVERRIDE_CC" && export CC="$OVERRIDE_CC";
-      test -n "$OVERRIDE_CXX" && export CXX="$OVERRIDE_CXX";
-      test -n "$OVERRIDE_PATH" && export PATH="$OVERRIDE_PATH:$PATH";
-
-      export CFLAGS="$CFLAGS -isystem`pwd`";
-
-      mkdir build &&
-      cd build &&
-      ../autogen.sh --enable-debug
-        $LIBUNWIND_FLAGS
-        $DRI_LOADERS
-        --with-dri-drivers=$DRI_DRIVERS
-        $GALLIUM_ST
-        --with-gallium-drivers=$GALLIUM_DRIVERS
-        --with-vulkan-drivers=$VULKAN_DRIVERS
-        --disable-llvm-shared-libs
-        &&
-      make && eval $MAKE_CHECK_COMMAND;
-    fi
-
   - if test "x$BUILD" = xscons; then
       test -n "$OVERRIDE_CC" && export CC="$OVERRIDE_CC";
       test -n "$OVERRIDE_CXX" && export CXX="$OVERRIDE_CXX";
---->8----

I'll need to test it, but I think with this the tests will just be
instants pass (not including the preparation of building and installing
all the deps for each test line).


More information about the mesa-dev mailing list