libpkgconf: add support for Haiku #180

ariadne · 2018-04-03T13:32:29Z

alaviss commented

2018-04-03 13:32:29 +00:00

(Migrated from github.com)

This patch add support for Haiku. The associated port can be found at https://github.com/haikuports/haikuports/pull/2026

This patch add support for [Haiku]. The associated port can be found at https://github.com/haikuports/haikuports/pull/2026 [Haiku]: https://www.haiku-os.org/

ariadne requested changes 2018-04-03 16:40:31 +00:00

libpkgconf/client.c

													
				@ -80,1 +80,4 @@

					/* GCC uses these environment variables to define system include paths, so we should check them. */

				#ifdef __HAIKU__

					pkgconf_path_build_from_environ("BELIBRARIES", NULL, &client->filter_libdirs, false);

				#else

ariadne commented

2018-04-03 16:40:13 +00:00

you are certain GCC never checks LIBRARY_PATH on BeOS/Haiku? that doesn't make much sense to me. i would assume that BELIBRARIES is concatenated into LIBRARY_PATH, which means pkgconf_path_build_from_environ should be called on both env vars, in that order.

you are certain GCC never checks `LIBRARY_PATH` on BeOS/Haiku? that doesn't make much sense to me. i would assume that `BELIBRARIES` is concatenated into `LIBRARY_PATH`, which means pkgconf_path_build_from_environ should be called on both env vars, in that order.

libpkgconf/pkg.c

ariadne commented

2018-04-03 16:36:54 +00:00

i'm not sure this is the way to go here. should we maybe introduce more abstraction?

tests/regress.sh

ariadne commented

2018-04-03 16:38:25 +00:00

i don't like this approach, but since it's one test, I guess it's fine. would prefer to handle Haiku in the same way as the other environments (see test_env.sh.in)

i don't like this approach, but since it's one test, I guess it's fine. would prefer to handle Haiku in the same way as the other environments (see `test_env.sh.in`)

alaviss (Migrated from github.com) reviewed 2018-04-04 00:20:42 +00:00

libpkgconf/client.c

													
				@ -80,1 +80,4 @@

					/* GCC uses these environment variables to define system include paths, so we should check them. */

				#ifdef __HAIKU__

					pkgconf_path_build_from_environ("BELIBRARIES", NULL, &client->filter_libdirs, false);

				#else

alaviss (Migrated from github.com) commented

2018-04-04 00:20:42 +00:00

LIBRARY_PATH is our LD_LIBRARY_PATH, so we patched our gcc to use BELIBRARIES instead.

`LIBRARY_PATH` is our `LD_LIBRARY_PATH`, so we [patched][0] our gcc to use `BELIBRARIES` instead. [0]: https://github.com/haikuports/haikuports/blob/master/sys-devel/gcc/patches/gcc-5.4.0_2016_06_04.patchset#L641

alaviss (Migrated from github.com) reviewed 2018-04-04 06:23:12 +00:00

libpkgconf/pkg.c

alaviss (Migrated from github.com) commented

2018-04-04 06:23:11 +00:00

Would something like

static inline void build_default_pkgconfig_path(pkgconf_list_t* dirlist);

sounds fine to you?

Would something like ```c static inline void build_default_pkgconfig_path(pkgconf_list_t* dirlist); ``` sounds fine to you?

ariadne reviewed 2018-04-05 05:41:00 +00:00

libpkgconf/pkg.c

ariadne commented

2018-04-05 05:40:54 +00:00

Yes, that would be fine.

ariadne reviewed 2018-04-05 05:41:14 +00:00

libpkgconf/client.c

													
				@ -80,1 +80,4 @@

					/* GCC uses these environment variables to define system include paths, so we should check them. */

				#ifdef __HAIKU__

					pkgconf_path_build_from_environ("BELIBRARIES", NULL, &client->filter_libdirs, false);

				#else