From patchwork Mon Jan 25 11:36:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Kochetkov X-Patchwork-Id: 1431151 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=inbox.ru header.i=@inbox.ru header.a=rsa-sha256 header.s=mail3 header.b=QMo3FUbu; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DPSTn56Djz9s24 for ; Mon, 25 Jan 2021 22:35:25 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id C8B028741F; Mon, 25 Jan 2021 11:35:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aqQUZ0MlswSG; Mon, 25 Jan 2021 11:35:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 821DF873E9; Mon, 25 Jan 2021 11:35:21 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 2BBFD1BF3DF for ; Mon, 25 Jan 2021 11:35:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 0B24420131 for ; Mon, 25 Jan 2021 11:35:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2reQNEczkWT2 for ; Mon, 25 Jan 2021 11:35:17 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from smtp43.i.mail.ru (smtp43.i.mail.ru [94.100.177.103]) by silver.osuosl.org (Postfix) with ESMTPS id B15172733D for ; Mon, 25 Jan 2021 11:35:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=inbox.ru; s=mail3; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:Cc:To:From:From:Subject:Content-Type:Content-Transfer-Encoding:To:Cc; bh=W8FZo7e/AD6RM0y8pedmNpt+TyiHnAWK/bCYiuIL9o0=; b=QMo3FUbuyQTtYi8jiyQL/iRebKaRsGrTgJ02CXnpRw7PDlZY7Pwd0PrcldzJpIgeHhD/DyV6HR2tdGdvL2s1Z9dEHJN48bSg2AFf0Am9ERo6q1iuBZwdE+GzcT36m23SdISp/CQAR9/Rn+X33HOOYslfXm9dWglOYq1Ui5422HA=; Received: by smtp43.i.mail.ru with esmtpa (envelope-from ) id 1l409J-0007Kq-Dk; Mon, 25 Jan 2021 14:35:13 +0300 To: buildroot@buildroot.org Date: Mon, 25 Jan 2021 14:36:12 +0300 Message-Id: <20210125113613.865987-1-fido_max@inbox.ru> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Authentication-Results: smtp43.i.mail.ru; auth=pass smtp.auth=fido_max@inbox.ru smtp.mailfrom=fido_max@inbox.ru X-7564579A: 78E4E2B564C1792B X-77F55803: 4F1203BC0FB41BD9F0E84CC1954AA43826590F9C90DBB1BA339FCEA3A090D44300894C459B0CD1B95FC51ACFDF69923097BD5B897A9E6198AE03EB01E1EAFA9368A59ACE1A350C76 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE78CB87876C5D626D4EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637DEEC83A7CF8598608638F802B75D45FF5571747095F342E8C7A0BC55FA0FE5FC5C862AC0F1A721EAD64DC9BDA2C2CD3D774B7D6EC376BD90389733CBF5DBD5E913377AFFFEAFD269176DF2183F8FC7C07E7E81EEA8A9722B8941B15DA834481FCF19DD082D7633A0EF3E4896CB9E6436389733CBF5DBD5E9D5E8D9A59859A8B68424CA1AAF98A6958941B15DA834481F9449624AB7ADAF37BA3038C0950A5D3613377AFFFEAFD26923F8577A6DFFEA7CC136C9B4EE35C5417B076A6E789B0E97A8DF7F3B2552694A1E7802607F20496D49FD398EE364050F38D4DC57D478E688287C8E22D4AE2A51B3661434B16C20AC78D18283394535A975ECD9A6C639B01BC09775C1D3CA48CFD703628AB378667775ECD9A6C639B01BBD4B6F7A4D31EC0BC0CAF46E325F83A522CA9DD8327EE4931B544F03EFBC4D57837C4FEFBD186071C4224003CC836476C0CAF46E325F83A50BF2EBBBDD9D6B0F05F538519369F3743B503F486389A921A5CC5B56E945C8DA X-C1DE0DAB: 8BD88D57C5CADBC8B2710865C38675100920FC4EF0AE1D47A3B1A56EE2B804F6B226C914C996894645FD9D8A29397D6EFF55FE49A3C2BFCFC8C84E951CD0BE2F296C473AB1E14218EA052B563B0B06C67866D6147AF826D8AF460519015862264C878C440A971C32F972CCD2F8FE1EF1CFC4036BBF6A4EA92719543D92104F06CB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34D95739AEDB3821B4EAC38B3E8B0936331F0C13D8473B86E395D5A8D5079D5C1F6FA3E0952231B9AC1D7E09C32AA3244C13B8356996DC345B2E3D42ADE581A90D259227199D06760AFACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojEcKN7r9rK/1uyiZMJKSaIQ== X-Mailru-Sender: 11C2EC085EDE56FA9C10FA2967F5AB24986B446294B22C7AF916DB89F0FAE978323B9D9DCCA56DD4EE9242D420CFEBFD3DDE9B364B0DF2891A624F84B2C74EDA4239CF2AF0A6D4F80DA7A0AF5A3A8387 X-Mras: Ok Subject: [Buildroot] [PATCH] package/postgresql: add some additional output to pg_config X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Maxim Kochetkov via buildroot Reply-To: Maxim Kochetkov Cc: Maxim Kochetkov , ps.report@gmx.net Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Some external packages call pg_config to determine the installed PostgreSQL options. Add this output to Buildroots own pg_config, so these packages correctly compile. Added options: --pkgincludedir --pgxs --cflags --cc --pkglibdir --bindir --sharedir --localedir --docdir --mandir Signed-off-by: Maxim Kochetkov --- package/postgresql/pg_config | 51 ++++++++++++++++++++++++++++++-- package/postgresql/postgresql.mk | 2 ++ 2 files changed, 51 insertions(+), 2 deletions(-) diff --git a/package/postgresql/pg_config b/package/postgresql/pg_config index 59a9e6cfad..3b0cb35f2c 100644 --- a/package/postgresql/pg_config +++ b/package/postgresql/pg_config @@ -2,7 +2,6 @@ # # Minimal pg_config implementation as replacement for the native pg_config application -# Only implements --includedir and --libdir # prefix=/usr @@ -11,6 +10,9 @@ case "$1" in --includedir) echo "$prefix/include" ;; + --pkgincludedir) + echo "$prefix/include/postgresql" + ;; --includedir-server) echo "$prefix/include/postgresql/server" ;; @@ -23,6 +25,51 @@ case "$1" in --configure) echo "@POSTGRESQL_CONF_OPTIONS@" ;; + --pgxs) + echo "$prefix/lib/postgresql/pgxs/src/makefiles/pgxs.mk" + ;; + --cflags) + echo "@TARGET_CFLAGS@" + ;; + --cc) + echo "@TARGET_CC@" + ;; + --pkglibdir) + echo "/usr/lib/postgresql" + ;; + --bindir) + echo "/usr/bin" + ;; + --sharedir) + echo "/usr/share/postgresql" + ;; + --localedir) + echo "/usr/share/locale" + ;; + --docdir) + echo "/usr/share/doc/postgresql" + ;; + --mandir) + echo "/usr/share/man" + ;; *) - echo "Usage: $0 {--includedir|--includedir-server|--libdir|--version|--configure}" + echo "Usage: $0 {OPTION}" + echo + echo "Options:" + echo + echo " --includedir show location of C header files of the client interfaces" + echo " --pkgincludedir show location of other C header files" + echo " --includedir-server show location of C header files for the server" + echo " --libdir show location of object code libraries" + echo " --version show the PostgreSQL version" + echo " --configure show options given to configure script" + echo " --pgxs show location of extension makefile" + echo " --cflags show CFLAGS value used when PostgreSQL was built" + echo " --cc show CC value used when PostgreSQL was built" + echo " --pkglibdir show location of dynamically loadable modules" + echo " --bindir show location of user executables" + echo " --sharedir show location of architecture-independent support files" + echo " --localedir show location of locale support files" + echo " --docdir show location of documentation files" + echo " --mandir show location of manual pages" esac diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 31c83d64c7..6c0726e88b 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -116,6 +116,8 @@ define POSTGRESQL_INSTALL_CUSTOM_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|@TARGET_CFLAGS@|$(TARGET_CFLAGS)|g" $(STAGING_DIR)/usr/bin/pg_config + $(SED) "s|@TARGET_CC@|$(TARGET_CC)|g" $(STAGING_DIR)/usr/bin/pg_config endef POSTGRESQL_POST_INSTALL_STAGING_HOOKS += POSTGRESQL_INSTALL_CUSTOM_PG_CONFIG