0001-meson.build-enable-static-build.patch 4.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169
  1. From d58a32776e08e193c24f7bb192daf72b66fbe550 Mon Sep 17 00:00:00 2001
  2. From: Peter Seiderer <ps.report@gmx.net>
  3. Date: Wed, 18 Jul 2018 21:35:18 +0200
  4. Subject: [PATCH] meson.build: enable static build
  5. Use meson library instead of shared_library to enable static build.
  6. Upstream suggested: https://lists.freedesktop.org/archives/dri-devel/2018-July/183886.html
  7. Signed-off-by: Peter Seiderer <ps.report@gmx.net>
  8. ---
  9. amdgpu/meson.build | 2 +-
  10. etnaviv/meson.build | 2 +-
  11. exynos/meson.build | 2 +-
  12. freedreno/meson.build | 2 +-
  13. intel/meson.build | 2 +-
  14. libkms/meson.build | 2 +-
  15. meson.build | 2 +-
  16. nouveau/meson.build | 2 +-
  17. omap/meson.build | 2 +-
  18. radeon/meson.build | 2 +-
  19. tegra/meson.build | 2 +-
  20. 11 files changed, 11 insertions(+), 11 deletions(-)
  21. diff --git a/amdgpu/meson.build b/amdgpu/meson.build
  22. index f39d7bf..1b4b0be 100644
  23. --- a/amdgpu/meson.build
  24. +++ b/amdgpu/meson.build
  25. @@ -21,7 +21,7 @@
  26. datadir_amdgpu = join_paths(get_option('prefix'), get_option('datadir'), 'libdrm')
  27. -libdrm_amdgpu = shared_library(
  28. +libdrm_amdgpu = library(
  29. 'drm_amdgpu',
  30. [
  31. files(
  32. diff --git a/etnaviv/meson.build b/etnaviv/meson.build
  33. index ca2aa54..a0d994e 100644
  34. --- a/etnaviv/meson.build
  35. +++ b/etnaviv/meson.build
  36. @@ -19,7 +19,7 @@
  37. # SOFTWARE.
  38. -libdrm_etnaviv = shared_library(
  39. +libdrm_etnaviv = library(
  40. 'drm_etnaviv',
  41. [
  42. files(
  43. diff --git a/exynos/meson.build b/exynos/meson.build
  44. index 30d3640..fd14f3a 100644
  45. --- a/exynos/meson.build
  46. +++ b/exynos/meson.build
  47. @@ -18,7 +18,7 @@
  48. # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  49. # SOFTWARE.
  50. -libdrm_exynos = shared_library(
  51. +libdrm_exynos = library(
  52. 'drm_exynos',
  53. [files('exynos_drm.c', 'exynos_fimg2d.c'), config_file],
  54. c_args : warn_c_args,
  55. diff --git a/freedreno/meson.build b/freedreno/meson.build
  56. index 015b7fb..6c8a6a7 100644
  57. --- a/freedreno/meson.build
  58. +++ b/freedreno/meson.build
  59. @@ -39,7 +39,7 @@ if with_freedreno_kgsl
  60. )
  61. endif
  62. -libdrm_freedreno = shared_library(
  63. +libdrm_freedreno = library(
  64. 'drm_freedreno',
  65. [files_freedreno, config_file],
  66. c_args : warn_c_args,
  67. diff --git a/intel/meson.build b/intel/meson.build
  68. index 53c7fce..14cabd3 100644
  69. --- a/intel/meson.build
  70. +++ b/intel/meson.build
  71. @@ -18,7 +18,7 @@
  72. # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  73. # SOFTWARE.
  74. -libdrm_intel = shared_library(
  75. +libdrm_intel = library(
  76. 'drm_intel',
  77. [
  78. files(
  79. diff --git a/libkms/meson.build b/libkms/meson.build
  80. index 86d1a4e..9d21e4c 100644
  81. --- a/libkms/meson.build
  82. +++ b/libkms/meson.build
  83. @@ -41,7 +41,7 @@ if with_exynos
  84. libkms_include += include_directories('../exynos')
  85. endif
  86. -libkms = shared_library(
  87. +libkms = library(
  88. 'kms',
  89. [files_libkms, config_file],
  90. c_args : warn_c_args,
  91. diff --git a/meson.build b/meson.build
  92. index 3c8afb6..7aa5f8c 100644
  93. --- a/meson.build
  94. +++ b/meson.build
  95. @@ -279,7 +279,7 @@ add_project_arguments('-include', 'config.h', language : 'c')
  96. inc_root = include_directories('.')
  97. inc_drm = include_directories('include/drm')
  98. -libdrm = shared_library(
  99. +libdrm = library(
  100. 'drm',
  101. [files(
  102. 'xf86drm.c', 'xf86drmHash.c', 'xf86drmRandom.c', 'xf86drmSL.c',
  103. diff --git a/nouveau/meson.build b/nouveau/meson.build
  104. index 51c9a71..acba048 100644
  105. --- a/nouveau/meson.build
  106. +++ b/nouveau/meson.build
  107. @@ -19,7 +19,7 @@
  108. # SOFTWARE.
  109. -libdrm_nouveau = shared_library(
  110. +libdrm_nouveau = library(
  111. 'drm_nouveau',
  112. [files( 'nouveau.c', 'pushbuf.c', 'bufctx.c', 'abi16.c'), config_file],
  113. c_args : warn_c_args,
  114. diff --git a/omap/meson.build b/omap/meson.build
  115. index e57b8f5..6cffb99 100644
  116. --- a/omap/meson.build
  117. +++ b/omap/meson.build
  118. @@ -18,7 +18,7 @@
  119. # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  120. # SOFTWARE.
  121. -libdrm_omap = shared_library(
  122. +libdrm_omap = library(
  123. 'drm_omap',
  124. [files('omap_drm.c'), config_file],
  125. include_directories : [inc_root, inc_drm],
  126. diff --git a/radeon/meson.build b/radeon/meson.build
  127. index b08c744..2f45ff7 100644
  128. --- a/radeon/meson.build
  129. +++ b/radeon/meson.build
  130. @@ -19,7 +19,7 @@
  131. # SOFTWARE.
  132. -libdrm_radeon = shared_library(
  133. +libdrm_radeon = library(
  134. 'drm_radeon',
  135. [
  136. files(
  137. diff --git a/tegra/meson.build b/tegra/meson.build
  138. index 1f5c74b..8d0cfa9 100644
  139. --- a/tegra/meson.build
  140. +++ b/tegra/meson.build
  141. @@ -18,7 +18,7 @@
  142. # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  143. # SOFTWARE.
  144. -libdrm_tegra = shared_library(
  145. +libdrm_tegra = library(
  146. 'drm_tegra',
  147. [files('tegra.c'), config_file],
  148. include_directories : [inc_root, inc_drm],
  149. --
  150. 2.18.0