pyrox.dev
lol
Switch to absolute path for includedir/libdir
+15
-15
+3
-3
pkgs/development/libraries/gstreamer/bad/fix_pkgconfig_includedir.patch
+3
-3
pkgs/development/libraries/gstreamer/bad/fix_pkgconfig_includedir.patch
···
1
1
diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build
2
-
index 271f327f3..ddc52cca8 100644
2
+
index 271f327f3..7e2afa754 100644
3
3
--- a/pkgconfig/meson.build
4
4
+++ b/pkgconfig/meson.build
5
5
@@ -2,8 +2,8 @@ pkgconf = configuration_data()
···
8
8
pkgconf.set('exec_prefix', '${prefix}')
9
9
-pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir')))
10
10
-pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir')))
11
-
+pkgconf.set('libdir', get_option('libdir'))
12
-
+pkgconf.set('includedir', get_option('includedir'))
11
+
+pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir')))
12
+
+pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir')))
13
13
pkgconf.set('GST_API_VERSION', api_version)
14
14
pkgconf.set('VERSION', gst_version)
15
15
+3
-3
pkgs/development/libraries/gstreamer/base/fix_pkgconfig_includedir.patch
+3
-3
pkgs/development/libraries/gstreamer/base/fix_pkgconfig_includedir.patch
···
1
1
diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build
2
-
index 04abfbee5..74e3f290d 100644
2
+
index 04abfbee5..88c86b431 100644
3
3
--- a/pkgconfig/meson.build
4
4
+++ b/pkgconfig/meson.build
5
5
@@ -2,8 +2,8 @@ pkgconf = configuration_data()
···
8
8
pkgconf.set('exec_prefix', '${prefix}')
9
9
-pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir')))
10
10
-pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir')))
11
-
+pkgconf.set('libdir', get_option('libdir'))
12
-
+pkgconf.set('includedir', get_option('includedir'))
11
+
+pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir')))
12
+
+pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir')))
13
13
pkgconf.set('GST_API_VERSION', api_version)
14
14
pkgconf.set('VERSION', gst_version)
15
15
pkgconf.set('LIBM', libm.found() ? '-lm' : '')
+3
-3
pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch
+3
-3
pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch
···
1
1
diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build
2
-
index edb0586c2..0325cdf4a 100644
2
+
index edb0586c2..7ed46dfce 100644
3
3
--- a/pkgconfig/meson.build
4
4
+++ b/pkgconfig/meson.build
5
5
@@ -2,8 +2,8 @@ pkgconf = configuration_data()
···
8
8
pkgconf.set('exec_prefix', '${prefix}')
9
9
-pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir')))
10
10
-pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir')))
11
-
+pkgconf.set('libdir', get_option('libdir'))
12
-
+pkgconf.set('includedir', get_option('includedir'))
11
+
+pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir')))
12
+
+pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir')))
13
13
pkgconf.set('GST_API_VERSION', apiversion)
14
14
pkgconf.set('VERSION', gst_version)
15
15
pkgconf.set('LIBM', mathlib.found() ? '-lm' : '')
+3
-3
pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch
+3
-3
pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch
···
1
1
diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build
2
-
index a612b21b..e19cdfe7 100644
2
+
index a612b21b..c017eaff 100644
3
3
--- a/pkgconfig/meson.build
4
4
+++ b/pkgconfig/meson.build
5
5
@@ -2,8 +2,8 @@ pkgconf = configuration_data()
···
8
8
pkgconf.set('exec_prefix', '${prefix}')
9
9
-pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir')))
10
10
-pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir')))
11
-
+pkgconf.set('libdir', get_option('libdir'))
12
-
+pkgconf.set('includedir', get_option('includedir'))
11
+
+pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir')))
12
+
+pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir')))
13
13
pkgconf.set('GST_API_VERSION', apiversion)
14
14
pkgconf.set('VERSION', gst_version)
15
15
+3
-3
pkgs/development/libraries/gstreamer/good/fix_pkgconfig_includedir.patch
+3
-3
pkgs/development/libraries/gstreamer/good/fix_pkgconfig_includedir.patch
···
1
1
diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build
2
-
index b3bf0d4d4..fb4386cfc 100644
2
+
index b3bf0d4d4..3e6e576c0 100644
3
3
--- a/pkgconfig/meson.build
4
4
+++ b/pkgconfig/meson.build
5
5
@@ -2,8 +2,8 @@ pkgconf = configuration_data()
···
8
8
pkgconf.set('exec_prefix', '${prefix}')
9
9
-pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir')))
10
10
-pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir')))
11
-
+pkgconf.set('libdir', get_option('libdir'))
12
-
+pkgconf.set('includedir', get_option('includedir'))
11
+
+pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir')))
12
+
+pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir')))
13
13
pkgconf.set('GST_API_VERSION', api_version)
14
14
pkgconf.set('VERSION', gst_version)
15
15