Fix previous commit: PLUGIN_COLUMNSTORE=YES can only be active on amd64

Refactor previous commit to fix mistake revealed by Buildbot. We can't
have a structure where PLUGIN_COLUMNSTORE would ever be 'YES' on an arch
that does not support it, as the flag overrides any potential platform
detection code and builds on non-amd64 would all fail.

debian/autobake-deb.sh

@@ -24,7 +24,7 @@ if [[ -d storage/columnstore/columnstore/debian ]]; then
   cat storage/columnstore/columnstore/debian/control >> debian/control
   # Don't build ColumnStore as part of the native build, only build it when triggered
   # by autobake-deb.sh
-  sed 's|-DPLUGIN_COLUMNSTORE=NO|-DPLUGIN_COLUMNSTORE=YES|' -i debian/rules
+  sed 's|#CMAKEFLAGS += -DPLUGIN_COLUMNSTORE=YES|CMAKEFLAGS += -DPLUGIN_COLUMNSTORE=YES|' -i debian/rules
 fi
 
 # General CI optimizations to keep build output smaller

debian/rules

@@ -51,7 +51,9 @@ endif
 # ColumnStore only attempts to build on a few platforms as dictated by CMake checks
 # Also note in debian/control the CS-only build deps marked '[amd64]'
 ifeq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),amd64))
-    CMAKEFLAGS += -DPLUGIN_COLUMNSTORE=YES
+    # Don't build ColumnStore as part of the native build, only build it when triggered
+    # by autobake-deb.sh. Saves build time and disk space.
+    #CMAKEFLAGS += -DPLUGIN_COLUMNSTORE=YES
 endif
 
 # Add extra flag to avoid WolfSSL code crashing the entire mariadbd on s390x. This
@@ -85,8 +87,6 @@ ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
 	dh_auto_build --builddirectory=builddir-native -- import_executables
 endif
 
-	# Don't build ColumnStore as part of the native build, only build it when triggered
-	# by autobake-deb.sh. Saves build time and disk space.
 	mkdir -p $(BUILDDIR) && cd $(BUILDDIR) && \
 	sh -c  'PATH=$${MYSQL_BUILD_PATH:-"/usr/lib/ccache:/usr/local/bin:/usr/bin:/bin"} \
 	    	CC=${CC} \
@@ -101,7 +101,6 @@ endif
 	    -DPLUGIN_TOKUDB=NO \
 	    -DPLUGIN_CASSANDRA=NO \
 	    -DPLUGIN_AWS_KEY_MANAGEMENT=NO \
-	    -DPLUGIN_COLUMNSTORE=NO \
 	    -DDEB=$(DEB_VENDOR) ..'
 
 # This is needed, otherwise 'make test' will run before binaries have been built