ARROW-6970: [Packaging][RPM] Add support for CentOS 8

Closes #5715 from kou/linux-package-centos-8 and squashes the following commits: a146685 <Sutou Kouhei> Add missing llvm-devel dependency a43a5cb <Sutou Kouhei> Add missing %if if CentOS 6 62407d9 <Sutou Kouhei> Fix %if syntax 26cf16c <Sutou Kouhei> Add support for CentOS 8 Authored-by: Sutou Kouhei <[email protected]> Signed-off-by: François Saint-Jacques <[email protected]>
apache · Oct 24, 2019 · 812d56c · 812d56c
1 parent 38298c9
commit 812d56c
Show file tree

Hide file tree

Showing 14 changed files with 485 additions and 21 deletions.
diff --git a/c_glib/example/lua/Makefile.am b/c_glib/example/lua/Makefile.am
@@ -15,6 +15,9 @@
 # specific language governing permissions and limitations
 # under the License.
 
+EXTRA_DIST =					\
+	meson.build
+
 lua_exampledir = $(exampledir)/lua
 dist_lua_example_DATA =				\
 	README.md				\

diff --git a/c_glib/example/lua/meson.build b/c_glib/example/lua/meson.build
@@ -0,0 +1,28 @@
+# -*- indent-tabs-mode: nil -*-
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+install_data('README.md',
+             'read-batch.lua',
+             'read-stream.lua',
+             'write-batch.lua',
+             'write-stream.lua',
+             install_dir: join_paths(data_dir,
+                                     meson.project_name(),
+                                     'example',
+                                     'lua'))
diff --git a/c_glib/example/meson.build b/c_glib/example/meson.build
@@ -18,8 +18,16 @@
 # under the License.
 
 executable('build', 'build.c',
-	   dependencies: [arrow_glib])
+           dependencies: [arrow_glib])
 executable('read-batch', 'read-batch.c',
-	   dependencies: [arrow_glib])
+           dependencies: [arrow_glib])
 executable('read-stream', 'read-stream.c',
-	   dependencies: [arrow_glib])
+           dependencies: [arrow_glib])
+
+install_data('README.md',
+             'build.c',
+             'read-batch.c',
+             'read-stream.c',
+             install_dir: join_paths(data_dir, meson.project_name(), 'example'))
+
+subdir('lua')
diff --git a/c_glib/meson.build b/c_glib/meson.build
@@ -56,7 +56,8 @@ arrow_cpp_build_type = get_option('arrow_cpp_build_type')
 if arrow_cpp_build_dir == ''
   arrow_cpp_build_lib_dir = ''
 else
-  arrow_cpp_build_lib_dir = join_paths(arrow_cpp_build_dir,
+  arrow_cpp_build_lib_dir = join_paths(meson.source_root(),
+                                       arrow_cpp_build_dir,
                                        arrow_cpp_build_type.to_lower())
 endif
 
@@ -130,6 +131,9 @@ if get_option('gtk_doc')
   endif
 endif
 
+install_data('README.md',
+             install_dir: join_paths(data_dir, 'doc', meson.project_name()))
+
 run_test = find_program('test/run-test.sh')
 test('unit test',
      run_test,

diff --git a/cpp/src/gandiva/precompiled/CMakeLists.txt b/cpp/src/gandiva/precompiled/CMakeLists.txt
@@ -80,7 +80,7 @@ add_custom_command(OUTPUT ${GANDIVA_PRECOMPILED_BC_PATH}
 
 # turn the bitcode file into a C++ static data variable.
 add_custom_command(OUTPUT ${GANDIVA_PRECOMPILED_CC_PATH}
-                   COMMAND python
+                   COMMAND ${PYTHON_EXECUTABLE}
                            "${CMAKE_CURRENT_SOURCE_DIR}/../make_precompiled_bitcode.py"
                            ${GANDIVA_PRECOMPILED_CC_IN_PATH}
                            ${GANDIVA_PRECOMPILED_BC_PATH}

diff --git a/dev/tasks/linux-packages/debian/rules b/dev/tasks/linux-packages/debian/rules
@@ -60,7 +60,7 @@ override_dh_auto_build:
 	  --buildsystem=meson+ninja			\
 	  --						\
 	  -Darrow_cpp_build_type=$(BUILD_TYPE)		\
-	  -Darrow_cpp_build_dir=$(CURDIR)/cpp_build	\
+	  -Darrow_cpp_build_dir=../cpp_build		\
 	  -Dgtk_doc=true
 	env							\
 	  LD_LIBRARY_PATH=$(CURDIR)/cpp_build/$(BUILD_TYPE)	\

diff --git a/dev/tasks/linux-packages/package-task.rb b/dev/tasks/linux-packages/package-task.rb
@@ -207,6 +207,8 @@ def define_yum_task
               "centos-6",
               "centos-7",
               # "centos-7-aarch64",
+              "centos-8",
+              # "centos-8-aarch64",
             ]
           end
           targets.each do |target|