[Buildroot] [PATCH 1/2] package/postgresql: add configure and includedir-server output to pg_config
Maxim Kochetkov
fido_max at inbox.ru
Mon Oct 5 10:19:50 UTC 2020
Some external packages call pg_config to determine the installed PostgreSQL
version. Add this output to Buildroots own pg_config, so these packages
correctly compile.
Signed-off-by: Maxim Kochetkov <fido_max at inbox.ru>
---
package/postgresql/pg_config | 8 +++++++-
package/postgresql/postgresql.mk | 1 +
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/package/postgresql/pg_config b/package/postgresql/pg_config
index 642252f27f..59a9e6cfad 100644
--- a/package/postgresql/pg_config
+++ b/package/postgresql/pg_config
@@ -11,12 +11,18 @@ case "$1" in
--includedir)
echo "$prefix/include"
;;
+ --includedir-server)
+ echo "$prefix/include/postgresql/server"
+ ;;
--libdir)
echo "$prefix/lib"
;;
--version)
echo "PostgreSQL @POSTGRESQL_VERSION@"
;;
+ --configure)
+ echo "@POSTGRESQL_CONF_OPTIONS@"
+ ;;
*)
- echo "Usage: $0 {--includedir|--libdir|--version}"
+ echo "Usage: $0 {--includedir|--includedir-server|--libdir|--version|--configure}"
esac
diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk
index 18c7b2ade4..3630b5a385 100644
--- a/package/postgresql/postgresql.mk
+++ b/package/postgresql/postgresql.mk
@@ -115,6 +115,7 @@ POSTGRESQL_POST_INSTALL_TARGET_HOOKS += POSTGRESQL_INSTALL_TARGET_FIXUP
define POSTGRESQL_INSTALL_CUSTOM_PG_CONFIG
$(INSTALL) -m 0755 -D package/postgresql/pg_config \
$(STAGING_DIR)/usr/bin/pg_config
+ $(SED) "s|@POSTGRESQL_CONF_OPTIONS@|$(POSTGRESQL_CONF_OPTS)|g" $(STAGING_DIR)/usr/bin/pg_config
$(SED) "s|@POSTGRESQL_VERSION@|$(POSTGRESQL_VERSION)|g" $(STAGING_DIR)/usr/bin/pg_config
endef
--
2.27.0
More information about the buildroot
mailing list