Unbreak build with meson >=0.52.0
This commit is contained in:
parent
f104f056ab
commit
e52c0feb7a
@ -1,9 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.98 2019/11/02 14:27:40 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.99 2019/11/08 07:47:29 ajacoutot Exp $
|
||||
|
||||
COMMENT= IDE for GNOME
|
||||
|
||||
GNOME_PROJECT= gnome-builder
|
||||
GNOME_VERSION= 3.34.1
|
||||
REVISION= 0
|
||||
|
||||
CATEGORIES= devel
|
||||
|
||||
|
19
x11/gnome/builder/patches/patch-src_libide_code_meson_build
Normal file
19
x11/gnome/builder/patches/patch-src_libide_code_meson_build
Normal file
@ -0,0 +1,19 @@
|
||||
$OpenBSD: patch-src_libide_code_meson_build,v 1.1 2019/11/08 07:47:29 ajacoutot Exp $
|
||||
|
||||
From c8b862b491cfbbb4f79b24d7cd90e4fb1f37cb9f Mon Sep 17 00:00:00 2001
|
||||
From: Diego Escalante Urrelo <diegoe@gnome.org>
|
||||
Date: Fri, 25 Oct 2019 04:49:15 -0500
|
||||
Subject: [PATCH] WIP: build: Fix link_whole usage for meson 0.52.0
|
||||
|
||||
Index: src/libide/code/meson.build
|
||||
--- src/libide/code/meson.build.orig
|
||||
+++ src/libide/code/meson.build
|
||||
@@ -175,7 +175,7 @@ libide_code = static_library('ide-code-' + libide_api_
|
||||
libide_code_dep = declare_dependency(
|
||||
sources: libide_code_private_headers + libide_code_generated_headers,
|
||||
dependencies: libide_code_deps,
|
||||
- link_whole: libide_code,
|
||||
+ link_with: libide_code,
|
||||
include_directories: include_directories('.'),
|
||||
)
|
||||
|
19
x11/gnome/builder/patches/patch-src_libide_core_meson_build
Normal file
19
x11/gnome/builder/patches/patch-src_libide_core_meson_build
Normal file
@ -0,0 +1,19 @@
|
||||
$OpenBSD: patch-src_libide_core_meson_build,v 1.1 2019/11/08 07:47:29 ajacoutot Exp $
|
||||
|
||||
From c8b862b491cfbbb4f79b24d7cd90e4fb1f37cb9f Mon Sep 17 00:00:00 2001
|
||||
From: Diego Escalante Urrelo <diegoe@gnome.org>
|
||||
Date: Fri, 25 Oct 2019 04:49:15 -0500
|
||||
Subject: [PATCH] WIP: build: Fix link_whole usage for meson 0.52.0
|
||||
|
||||
Index: src/libide/core/meson.build
|
||||
--- src/libide/core/meson.build.orig
|
||||
+++ src/libide/core/meson.build
|
||||
@@ -117,7 +117,7 @@ libide_core = static_library('ide-core-' + libide_api_
|
||||
libide_core_dep = declare_dependency(
|
||||
sources: libide_core_private_headers + libide_core_generated_headers,
|
||||
dependencies: libide_core_deps,
|
||||
- link_whole: libide_core,
|
||||
+ link_with: libide_core,
|
||||
include_directories: include_directories('.'),
|
||||
)
|
||||
|
@ -0,0 +1,19 @@
|
||||
$OpenBSD: patch-src_libide_debugger_meson_build,v 1.1 2019/11/08 07:47:29 ajacoutot Exp $
|
||||
|
||||
From c8b862b491cfbbb4f79b24d7cd90e4fb1f37cb9f Mon Sep 17 00:00:00 2001
|
||||
From: Diego Escalante Urrelo <diegoe@gnome.org>
|
||||
Date: Fri, 25 Oct 2019 04:49:15 -0500
|
||||
Subject: [PATCH] WIP: build: Fix link_whole usage for meson 0.52.0
|
||||
|
||||
Index: src/libide/debugger/meson.build
|
||||
--- src/libide/debugger/meson.build.orig
|
||||
+++ src/libide/debugger/meson.build
|
||||
@@ -84,7 +84,7 @@ libide_debugger = static_library('ide-debugger-' + lib
|
||||
libide_debugger_dep = declare_dependency(
|
||||
sources: libide_debugger_private_headers + libide_debugger_generated_headers,
|
||||
dependencies: libide_debugger_deps,
|
||||
- link_whole: libide_debugger,
|
||||
+ link_with: libide_debugger,
|
||||
include_directories: include_directories('.'),
|
||||
)
|
||||
|
@ -0,0 +1,19 @@
|
||||
$OpenBSD: patch-src_libide_editor_meson_build,v 1.1 2019/11/08 07:47:29 ajacoutot Exp $
|
||||
|
||||
From c8b862b491cfbbb4f79b24d7cd90e4fb1f37cb9f Mon Sep 17 00:00:00 2001
|
||||
From: Diego Escalante Urrelo <diegoe@gnome.org>
|
||||
Date: Fri, 25 Oct 2019 04:49:15 -0500
|
||||
Subject: [PATCH] WIP: build: Fix link_whole usage for meson 0.52.0
|
||||
|
||||
Index: src/libide/editor/meson.build
|
||||
--- src/libide/editor/meson.build.orig
|
||||
+++ src/libide/editor/meson.build
|
||||
@@ -107,7 +107,7 @@ libide_editor = static_library('ide-editor-' + libide_
|
||||
|
||||
libide_editor_dep = declare_dependency(
|
||||
dependencies: libide_editor_deps,
|
||||
- link_whole: libide_editor,
|
||||
+ link_with: libide_editor,
|
||||
include_directories: include_directories('.'),
|
||||
sources: libide_editor_generated_headers,
|
||||
)
|
@ -0,0 +1,19 @@
|
||||
$OpenBSD: patch-src_libide_foundry_meson_build,v 1.1 2019/11/08 07:47:29 ajacoutot Exp $
|
||||
|
||||
From c8b862b491cfbbb4f79b24d7cd90e4fb1f37cb9f Mon Sep 17 00:00:00 2001
|
||||
From: Diego Escalante Urrelo <diegoe@gnome.org>
|
||||
Date: Fri, 25 Oct 2019 04:49:15 -0500
|
||||
Subject: [PATCH] WIP: build: Fix link_whole usage for meson 0.52.0
|
||||
|
||||
Index: src/libide/foundry/meson.build
|
||||
--- src/libide/foundry/meson.build.orig
|
||||
+++ src/libide/foundry/meson.build
|
||||
@@ -178,7 +178,7 @@ libide_foundry = static_library('ide-foundry-' + libid
|
||||
|
||||
libide_foundry_dep = declare_dependency(
|
||||
dependencies: libide_foundry_deps,
|
||||
- link_whole: libide_foundry,
|
||||
+ link_with: libide_foundry,
|
||||
include_directories: include_directories('.'),
|
||||
sources: libide_foundry_generated_headers,
|
||||
)
|
@ -0,0 +1,19 @@
|
||||
$OpenBSD: patch-src_libide_greeter_meson_build,v 1.1 2019/11/08 07:47:29 ajacoutot Exp $
|
||||
|
||||
From c8b862b491cfbbb4f79b24d7cd90e4fb1f37cb9f Mon Sep 17 00:00:00 2001
|
||||
From: Diego Escalante Urrelo <diegoe@gnome.org>
|
||||
Date: Fri, 25 Oct 2019 04:49:15 -0500
|
||||
Subject: [PATCH] WIP: build: Fix link_whole usage for meson 0.52.0
|
||||
|
||||
Index: src/libide/greeter/meson.build
|
||||
--- src/libide/greeter/meson.build.orig
|
||||
+++ src/libide/greeter/meson.build
|
||||
@@ -83,7 +83,7 @@ libide_greeter = static_library('ide-greeter-' + libid
|
||||
libide_greeter_dep = declare_dependency(
|
||||
sources: libide_greeter_private_headers + libide_greeter_generated_headers,
|
||||
dependencies: libide_greeter_deps,
|
||||
- link_whole: libide_greeter,
|
||||
+ link_with: libide_greeter,
|
||||
include_directories: include_directories('.'),
|
||||
)
|
||||
|
19
x11/gnome/builder/patches/patch-src_libide_gui_meson_build
Normal file
19
x11/gnome/builder/patches/patch-src_libide_gui_meson_build
Normal file
@ -0,0 +1,19 @@
|
||||
$OpenBSD: patch-src_libide_gui_meson_build,v 1.1 2019/11/08 07:47:29 ajacoutot Exp $
|
||||
|
||||
From c8b862b491cfbbb4f79b24d7cd90e4fb1f37cb9f Mon Sep 17 00:00:00 2001
|
||||
From: Diego Escalante Urrelo <diegoe@gnome.org>
|
||||
Date: Fri, 25 Oct 2019 04:49:15 -0500
|
||||
Subject: [PATCH] WIP: build: Fix link_whole usage for meson 0.52.0
|
||||
|
||||
Index: src/libide/gui/meson.build
|
||||
--- src/libide/gui/meson.build.orig
|
||||
+++ src/libide/gui/meson.build
|
||||
@@ -204,7 +204,7 @@ libide_gui = static_library('ide-gui-' + libide_api_ve
|
||||
libide_gui_dep = declare_dependency(
|
||||
sources: libide_gui_private_headers + libide_gui_generated_headers,
|
||||
dependencies: libide_gui_deps,
|
||||
- link_whole: libide_gui,
|
||||
+ link_with: libide_gui,
|
||||
include_directories: include_directories('.'),
|
||||
)
|
||||
|
19
x11/gnome/builder/patches/patch-src_libide_io_meson_build
Normal file
19
x11/gnome/builder/patches/patch-src_libide_io_meson_build
Normal file
@ -0,0 +1,19 @@
|
||||
$OpenBSD: patch-src_libide_io_meson_build,v 1.1 2019/11/08 07:47:30 ajacoutot Exp $
|
||||
|
||||
From c8b862b491cfbbb4f79b24d7cd90e4fb1f37cb9f Mon Sep 17 00:00:00 2001
|
||||
From: Diego Escalante Urrelo <diegoe@gnome.org>
|
||||
Date: Fri, 25 Oct 2019 04:49:15 -0500
|
||||
Subject: [PATCH] WIP: build: Fix link_whole usage for meson 0.52.0
|
||||
|
||||
Index: src/libide/io/meson.build
|
||||
--- src/libide/io/meson.build.orig
|
||||
+++ src/libide/io/meson.build
|
||||
@@ -63,7 +63,7 @@ libide_io = static_library('ide-io-' + libide_api_vers
|
||||
|
||||
libide_io_dep = declare_dependency(
|
||||
dependencies: [ libgio_dep, libide_core_dep, libide_threading_dep ],
|
||||
- link_whole: libide_io,
|
||||
+ link_with: libide_io,
|
||||
include_directories: include_directories('.'),
|
||||
)
|
||||
|
19
x11/gnome/builder/patches/patch-src_libide_lsp_meson_build
Normal file
19
x11/gnome/builder/patches/patch-src_libide_lsp_meson_build
Normal file
@ -0,0 +1,19 @@
|
||||
$OpenBSD: patch-src_libide_lsp_meson_build,v 1.1 2019/11/08 07:47:30 ajacoutot Exp $
|
||||
|
||||
From c8b862b491cfbbb4f79b24d7cd90e4fb1f37cb9f Mon Sep 17 00:00:00 2001
|
||||
From: Diego Escalante Urrelo <diegoe@gnome.org>
|
||||
Date: Fri, 25 Oct 2019 04:49:15 -0500
|
||||
Subject: [PATCH] WIP: build: Fix link_whole usage for meson 0.52.0
|
||||
|
||||
Index: src/libide/lsp/meson.build
|
||||
--- src/libide/lsp/meson.build.orig
|
||||
+++ src/libide/lsp/meson.build
|
||||
@@ -84,7 +84,7 @@ libide_lsp = static_library('ide-lsp-' + libide_api_ve
|
||||
libide_lsp_dep = declare_dependency(
|
||||
sources: libide_lsp_private_headers,
|
||||
dependencies: libide_lsp_deps,
|
||||
- link_whole: libide_lsp,
|
||||
+ link_with: libide_lsp,
|
||||
include_directories: include_directories('.'),
|
||||
)
|
||||
|
@ -0,0 +1,19 @@
|
||||
$OpenBSD: patch-src_libide_plugins_meson_build,v 1.1 2019/11/08 07:47:30 ajacoutot Exp $
|
||||
|
||||
From c8b862b491cfbbb4f79b24d7cd90e4fb1f37cb9f Mon Sep 17 00:00:00 2001
|
||||
From: Diego Escalante Urrelo <diegoe@gnome.org>
|
||||
Date: Fri, 25 Oct 2019 04:49:15 -0500
|
||||
Subject: [PATCH] WIP: build: Fix link_whole usage for meson 0.52.0
|
||||
|
||||
Index: src/libide/plugins/meson.build
|
||||
--- src/libide/plugins/meson.build.orig
|
||||
+++ src/libide/plugins/meson.build
|
||||
@@ -51,7 +51,7 @@ libide_plugins = static_library('ide-plugins-' + libid
|
||||
libide_plugins_dep = declare_dependency(
|
||||
sources: libide_plugins_private_headers,
|
||||
dependencies: libide_plugins_deps,
|
||||
- link_whole: libide_plugins,
|
||||
+ link_with: libide_plugins,
|
||||
include_directories: include_directories('.'),
|
||||
)
|
||||
|
@ -0,0 +1,19 @@
|
||||
$OpenBSD: patch-src_libide_projects_meson_build,v 1.1 2019/11/08 07:47:30 ajacoutot Exp $
|
||||
|
||||
From c8b862b491cfbbb4f79b24d7cd90e4fb1f37cb9f Mon Sep 17 00:00:00 2001
|
||||
From: Diego Escalante Urrelo <diegoe@gnome.org>
|
||||
Date: Fri, 25 Oct 2019 04:49:15 -0500
|
||||
Subject: [PATCH] WIP: build: Fix link_whole usage for meson 0.52.0
|
||||
|
||||
Index: src/libide/projects/meson.build
|
||||
--- src/libide/projects/meson.build.orig
|
||||
+++ src/libide/projects/meson.build
|
||||
@@ -79,7 +79,7 @@ libide_projects = static_library('ide-projects-' + lib
|
||||
libide_projects_dep = declare_dependency(
|
||||
sources: libide_projects_private_headers,
|
||||
dependencies: libide_projects_deps,
|
||||
- link_whole: libide_projects,
|
||||
+ link_with: libide_projects,
|
||||
include_directories: include_directories('.'),
|
||||
)
|
||||
|
@ -0,0 +1,19 @@
|
||||
$OpenBSD: patch-src_libide_search_meson_build,v 1.1 2019/11/08 07:47:30 ajacoutot Exp $
|
||||
|
||||
From c8b862b491cfbbb4f79b24d7cd90e4fb1f37cb9f Mon Sep 17 00:00:00 2001
|
||||
From: Diego Escalante Urrelo <diegoe@gnome.org>
|
||||
Date: Fri, 25 Oct 2019 04:49:15 -0500
|
||||
Subject: [PATCH] WIP: build: Fix link_whole usage for meson 0.52.0
|
||||
|
||||
Index: src/libide/search/meson.build
|
||||
--- src/libide/search/meson.build.orig
|
||||
+++ src/libide/search/meson.build
|
||||
@@ -51,7 +51,7 @@ libide_search = static_library('ide-search-' + libide_
|
||||
|
||||
libide_search_dep = declare_dependency(
|
||||
dependencies: libide_search_deps,
|
||||
- link_whole: libide_search,
|
||||
+ link_with: libide_search,
|
||||
include_directories: include_directories('.'),
|
||||
)
|
||||
|
@ -0,0 +1,19 @@
|
||||
$OpenBSD: patch-src_libide_sourceview_meson_build,v 1.1 2019/11/08 07:47:30 ajacoutot Exp $
|
||||
|
||||
From c8b862b491cfbbb4f79b24d7cd90e4fb1f37cb9f Mon Sep 17 00:00:00 2001
|
||||
From: Diego Escalante Urrelo <diegoe@gnome.org>
|
||||
Date: Fri, 25 Oct 2019 04:49:15 -0500
|
||||
Subject: [PATCH] WIP: build: Fix link_whole usage for meson 0.52.0
|
||||
|
||||
Index: src/libide/sourceview/meson.build
|
||||
--- src/libide/sourceview/meson.build.orig
|
||||
+++ src/libide/sourceview/meson.build
|
||||
@@ -158,7 +158,7 @@ libide_sourceview = static_library('ide-sourceview-' +
|
||||
libide_sourceview_dep = declare_dependency(
|
||||
sources: libide_sourceview_private_headers + libide_sourceview_generated_headers,
|
||||
dependencies: libide_sourceview_deps,
|
||||
- link_whole: libide_sourceview,
|
||||
+ link_with: libide_sourceview,
|
||||
include_directories: include_directories('.'),
|
||||
)
|
||||
|
@ -0,0 +1,19 @@
|
||||
$OpenBSD: patch-src_libide_terminal_meson_build,v 1.1 2019/11/08 07:47:30 ajacoutot Exp $
|
||||
|
||||
From c8b862b491cfbbb4f79b24d7cd90e4fb1f37cb9f Mon Sep 17 00:00:00 2001
|
||||
From: Diego Escalante Urrelo <diegoe@gnome.org>
|
||||
Date: Fri, 25 Oct 2019 04:49:15 -0500
|
||||
Subject: [PATCH] WIP: build: Fix link_whole usage for meson 0.52.0
|
||||
|
||||
Index: src/libide/terminal/meson.build
|
||||
--- src/libide/terminal/meson.build.orig
|
||||
+++ src/libide/terminal/meson.build
|
||||
@@ -93,7 +93,7 @@ libide_terminal = static_library('ide-terminal-' + lib
|
||||
libide_terminal_dep = declare_dependency(
|
||||
sources: libide_terminal_generated_headers,
|
||||
dependencies: libide_terminal_deps,
|
||||
- link_whole: libide_terminal,
|
||||
+ link_with: libide_terminal,
|
||||
include_directories: include_directories('.'),
|
||||
)
|
||||
|
@ -0,0 +1,19 @@
|
||||
$OpenBSD: patch-src_libide_themes_meson_build,v 1.1 2019/11/08 07:47:30 ajacoutot Exp $
|
||||
|
||||
From c8b862b491cfbbb4f79b24d7cd90e4fb1f37cb9f Mon Sep 17 00:00:00 2001
|
||||
From: Diego Escalante Urrelo <diegoe@gnome.org>
|
||||
Date: Fri, 25 Oct 2019 04:49:15 -0500
|
||||
Subject: [PATCH] WIP: build: Fix link_whole usage for meson 0.52.0
|
||||
|
||||
Index: src/libide/themes/meson.build
|
||||
--- src/libide/themes/meson.build.orig
|
||||
+++ src/libide/themes/meson.build
|
||||
@@ -46,7 +46,7 @@ libide_themes = static_library('ide-themes-' + libide_
|
||||
libide_themes_dep = declare_dependency(
|
||||
sources: libide_themes_resources[1],
|
||||
dependencies: libide_themes_deps,
|
||||
- link_whole: libide_themes,
|
||||
+ link_with: libide_themes,
|
||||
include_directories: include_directories('.'),
|
||||
)
|
||||
|
@ -0,0 +1,19 @@
|
||||
$OpenBSD: patch-src_libide_threading_meson_build,v 1.1 2019/11/08 07:47:30 ajacoutot Exp $
|
||||
|
||||
From c8b862b491cfbbb4f79b24d7cd90e4fb1f37cb9f Mon Sep 17 00:00:00 2001
|
||||
From: Diego Escalante Urrelo <diegoe@gnome.org>
|
||||
Date: Fri, 25 Oct 2019 04:49:15 -0500
|
||||
Subject: [PATCH] WIP: build: Fix link_whole usage for meson 0.52.0
|
||||
|
||||
Index: src/libide/threading/meson.build
|
||||
--- src/libide/threading/meson.build.orig
|
||||
+++ src/libide/threading/meson.build
|
||||
@@ -66,7 +66,7 @@ libide_threading = static_library('ide-threading-' + l
|
||||
libide_threading_dep = declare_dependency(
|
||||
sources: libide_threading_private_headers,
|
||||
dependencies: libide_threading_deps,
|
||||
- link_whole: libide_threading,
|
||||
+ link_with: libide_threading,
|
||||
include_directories: include_directories('.'),
|
||||
)
|
||||
|
19
x11/gnome/builder/patches/patch-src_libide_tree_meson_build
Normal file
19
x11/gnome/builder/patches/patch-src_libide_tree_meson_build
Normal file
@ -0,0 +1,19 @@
|
||||
$OpenBSD: patch-src_libide_tree_meson_build,v 1.1 2019/11/08 07:47:30 ajacoutot Exp $
|
||||
|
||||
From c8b862b491cfbbb4f79b24d7cd90e4fb1f37cb9f Mon Sep 17 00:00:00 2001
|
||||
From: Diego Escalante Urrelo <diegoe@gnome.org>
|
||||
Date: Fri, 25 Oct 2019 04:49:15 -0500
|
||||
Subject: [PATCH] WIP: build: Fix link_whole usage for meson 0.52.0
|
||||
|
||||
Index: src/libide/tree/meson.build
|
||||
--- src/libide/tree/meson.build.orig
|
||||
+++ src/libide/tree/meson.build
|
||||
@@ -61,7 +61,7 @@ libide_tree = static_library('ide-tree-' + libide_api_
|
||||
libide_tree_dep = declare_dependency(
|
||||
sources: libide_tree_private_headers,
|
||||
dependencies: libide_tree_deps,
|
||||
- link_whole: libide_tree,
|
||||
+ link_with: libide_tree,
|
||||
include_directories: include_directories('.'),
|
||||
)
|
||||
|
19
x11/gnome/builder/patches/patch-src_libide_vcs_meson_build
Normal file
19
x11/gnome/builder/patches/patch-src_libide_vcs_meson_build
Normal file
@ -0,0 +1,19 @@
|
||||
$OpenBSD: patch-src_libide_vcs_meson_build,v 1.1 2019/11/08 07:47:30 ajacoutot Exp $
|
||||
|
||||
From c8b862b491cfbbb4f79b24d7cd90e4fb1f37cb9f Mon Sep 17 00:00:00 2001
|
||||
From: Diego Escalante Urrelo <diegoe@gnome.org>
|
||||
Date: Fri, 25 Oct 2019 04:49:15 -0500
|
||||
Subject: [PATCH] WIP: build: Fix link_whole usage for meson 0.52.0
|
||||
|
||||
Index: src/libide/vcs/meson.build
|
||||
--- src/libide/vcs/meson.build.orig
|
||||
+++ src/libide/vcs/meson.build
|
||||
@@ -84,7 +84,7 @@ libide_vcs = static_library('ide-vcs-' + libide_api_ve
|
||||
|
||||
libide_vcs_dep = declare_dependency(
|
||||
dependencies: libide_vcs_deps,
|
||||
- link_whole: libide_vcs,
|
||||
+ link_with: libide_vcs,
|
||||
include_directories: include_directories('.'),
|
||||
sources: libide_vcs_generated_headers,
|
||||
)
|
@ -0,0 +1,19 @@
|
||||
$OpenBSD: patch-src_libide_webkit_meson_build,v 1.1 2019/11/08 07:47:30 ajacoutot Exp $
|
||||
|
||||
From c8b862b491cfbbb4f79b24d7cd90e4fb1f37cb9f Mon Sep 17 00:00:00 2001
|
||||
From: Diego Escalante Urrelo <diegoe@gnome.org>
|
||||
Date: Fri, 25 Oct 2019 04:49:15 -0500
|
||||
Subject: [PATCH] WIP: build: Fix link_whole usage for meson 0.52.0
|
||||
|
||||
Index: src/libide/webkit/meson.build
|
||||
--- src/libide/webkit/meson.build.orig
|
||||
+++ src/libide/webkit/meson.build
|
||||
@@ -39,7 +39,7 @@ libide_webkit = static_library('ide-webkit-' + libide_
|
||||
|
||||
libide_webkit_dep = declare_dependency(
|
||||
dependencies: libide_webkit_deps,
|
||||
- link_whole: libide_webkit,
|
||||
+ link_with: libide_webkit,
|
||||
include_directories: include_directories('.'),
|
||||
sources: libide_webkit_generated_headers,
|
||||
)
|
50
x11/gnome/builder/patches/patch-src_meson_build
Normal file
50
x11/gnome/builder/patches/patch-src_meson_build
Normal file
@ -0,0 +1,50 @@
|
||||
$OpenBSD: patch-src_meson_build,v 1.1 2019/11/08 07:47:30 ajacoutot Exp $
|
||||
|
||||
From c8b862b491cfbbb4f79b24d7cd90e4fb1f37cb9f Mon Sep 17 00:00:00 2001
|
||||
From: Diego Escalante Urrelo <diegoe@gnome.org>
|
||||
Date: Fri, 25 Oct 2019 04:49:15 -0500
|
||||
Subject: [PATCH] WIP: build: Fix link_whole usage for meson 0.52.0
|
||||
|
||||
Index: src/meson.build
|
||||
--- src/meson.build.orig
|
||||
+++ src/meson.build
|
||||
@@ -48,6 +48,30 @@ gnome_builder_deps = [
|
||||
libide_tree_dep,
|
||||
]
|
||||
|
||||
+gnome_builder_static = [
|
||||
+ libide_code,
|
||||
+ libide_core,
|
||||
+ libide_debugger,
|
||||
+ libide_editor,
|
||||
+ libide_foundry,
|
||||
+ libide_greeter,
|
||||
+ libide_gui,
|
||||
+ libide_io,
|
||||
+ libide_lsp,
|
||||
+ libide_plugins,
|
||||
+ libide_projects,
|
||||
+ libide_search,
|
||||
+ libide_sourceview,
|
||||
+ libide_terminal,
|
||||
+ libide_themes,
|
||||
+ libide_threading,
|
||||
+ libide_tree,
|
||||
+ libide_vcs,
|
||||
+ libide_webkit,
|
||||
+
|
||||
+ plugins,
|
||||
+]
|
||||
+
|
||||
if libsysprof_capture.found()
|
||||
gnome_builder_deps += libsysprof_capture
|
||||
endif
|
||||
@@ -77,7 +101,7 @@ gnome_builder = executable('gnome-builder', 'main.c',
|
||||
c_args: libide_args + exe_c_args + release_args,
|
||||
link_args: exe_link_args,
|
||||
pie: true,
|
||||
- link_whole: plugins,
|
||||
+ link_whole: gnome_builder_static,
|
||||
install_rpath: pkglibdir_abs,
|
||||
dependencies: gnome_builder_deps,
|
||||
)
|
Loading…
Reference in New Issue
Block a user