mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 14:01:57 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/postgresql: add configure and includedir-server output to pg_config

Browse Source 
Some external packages call pg_config to determine the installed
PostgreSQL server includedir and configure options. Add this output to
Buildroots own pg_config, so these packages correctly compile.

Signed-off-by: Maxim Kochetkov <fido_max@inbox.ru>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 787ad0b35d)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Maxim Kochetkov
2020-10-05 13:19:50 +03:00
committed by Peter Korsgaard
parent 0953cb557e
commit 8d3243493b
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
package/postgresql/pg_config
View File

@@ -11,12 +11,18 @@ case "$1" in
--includedir) --includedir)
echo "$prefix/include" echo "$prefix/include"
;; ;;
--includedir-server)
echo "$prefix/include/postgresql/server"
;;
--libdir) --libdir)
echo "$prefix/lib" echo "$prefix/lib"
;; ;;
--version) --version)
echo "PostgreSQL @POSTGRESQL_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 esac

1
package/postgresql/postgresql.mk
View File

@@ -115,6 +115,7 @@ POSTGRESQL_POST_INSTALL_TARGET_HOOKS += POSTGRESQL_INSTALL_TARGET_FIXUP
define POSTGRESQL_INSTALL_CUSTOM_PG_CONFIG define POSTGRESQL_INSTALL_CUSTOM_PG_CONFIG
$(INSTALL) -m 0755 -D package/postgresql/pg_config \ $(INSTALL) -m 0755 -D package/postgresql/pg_config \
$(STAGING_DIR)/usr/bin/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 $(SED) "s|@POSTGRESQL_VERSION@|$(POSTGRESQL_VERSION)|g" $(STAGING_DIR)/usr/bin/pg_config
endef endef