mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 15:41:40 +00:00
Code Issues Wiki Activity

Switch to absolute path for includedir/libdir

Browse source
This commit is contained in:
Bastian Köcher 2018-04-02 18:48:48 +02:00
parent 3508f3058d
commit 40b4b87cc4
5 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/libraries/gstreamer/bad/fix_pkgconfig_includedir.patch
View file

@ -1,5 +1,5 @@
diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build
index 271f327f3..ddc52cca8 100644
index 271f327f3..7e2afa754 100644
--- a/pkgconfig/meson.build
+++ b/pkgconfig/meson.build
@@ -2,8 +2,8 @@ pkgconf = configuration_data()
@ -8,8 +8,8 @@ index 271f327f3..ddc52cca8 100644
pkgconf.set('exec_prefix', '${prefix}')
-pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir')))
-pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir')))
+pkgconf.set('libdir', get_option('libdir'))
+pkgconf.set('includedir', get_option('includedir'))
+pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir')))
+pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir')))
pkgconf.set('GST_API_VERSION', api_version)
pkgconf.set('VERSION', gst_version)

6
pkgs/development/libraries/gstreamer/base/fix_pkgconfig_includedir.patch
View file

@ -1,5 +1,5 @@
diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build
index 04abfbee5..74e3f290d 100644
index 04abfbee5..88c86b431 100644
--- a/pkgconfig/meson.build
+++ b/pkgconfig/meson.build
@@ -2,8 +2,8 @@ pkgconf = configuration_data()
@ -8,8 +8,8 @@ index 04abfbee5..74e3f290d 100644
pkgconf.set('exec_prefix', '${prefix}')
-pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir')))
-pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir')))
+pkgconf.set('libdir', get_option('libdir'))
+pkgconf.set('includedir', get_option('includedir'))
+pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir')))
+pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir')))
pkgconf.set('GST_API_VERSION', api_version)
pkgconf.set('VERSION', gst_version)
pkgconf.set('LIBM', libm.found() ? '-lm' : '')

6
pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch
View file

@ -1,5 +1,5 @@
diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build
index edb0586c2..0325cdf4a 100644
index edb0586c2..7ed46dfce 100644
--- a/pkgconfig/meson.build
+++ b/pkgconfig/meson.build
@@ -2,8 +2,8 @@ pkgconf = configuration_data()
@ -8,8 +8,8 @@ index edb0586c2..0325cdf4a 100644
pkgconf.set('exec_prefix', '${prefix}')
-pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir')))
-pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir')))
+pkgconf.set('libdir', get_option('libdir'))
+pkgconf.set('includedir', get_option('includedir'))
+pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir')))
+pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir')))
pkgconf.set('GST_API_VERSION', apiversion)
pkgconf.set('VERSION', gst_version)
pkgconf.set('LIBM', mathlib.found() ? '-lm' : '')

6
pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch
View file

@ -1,5 +1,5 @@
diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build
index a612b21b..e19cdfe7 100644
index a612b21b..c017eaff 100644
--- a/pkgconfig/meson.build
+++ b/pkgconfig/meson.build
@@ -2,8 +2,8 @@ pkgconf = configuration_data()
@ -8,8 +8,8 @@ index a612b21b..e19cdfe7 100644
pkgconf.set('exec_prefix', '${prefix}')
-pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir')))
-pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir')))
+pkgconf.set('libdir', get_option('libdir'))
+pkgconf.set('includedir', get_option('includedir'))
+pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir')))
+pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir')))
pkgconf.set('GST_API_VERSION', apiversion)
pkgconf.set('VERSION', gst_version)

6
pkgs/development/libraries/gstreamer/good/fix_pkgconfig_includedir.patch
View file

@ -1,5 +1,5 @@
diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build
index b3bf0d4d4..fb4386cfc 100644
index b3bf0d4d4..3e6e576c0 100644
--- a/pkgconfig/meson.build
+++ b/pkgconfig/meson.build
@@ -2,8 +2,8 @@ pkgconf = configuration_data()
@ -8,8 +8,8 @@ index b3bf0d4d4..fb4386cfc 100644
pkgconf.set('exec_prefix', '${prefix}')
-pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir')))
-pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir')))
+pkgconf.set('libdir', get_option('libdir'))
+pkgconf.set('includedir', get_option('includedir'))
+pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir')))
+pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir')))
pkgconf.set('GST_API_VERSION', api_version)
pkgconf.set('VERSION', gst_version)