From patchwork Mon Oct 5 10:19:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Kochetkov X-Patchwork-Id: 1376730 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.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=reject dis=none) header.from=inbox.ru 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=VBILaXg2; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C4c5t54qBz9sTK for ; Mon, 5 Oct 2020 21:19:30 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 51D5E85653; Mon, 5 Oct 2020 10:19:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id i5h5wSZHdV57; Mon, 5 Oct 2020 10:19:28 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0720C85633; Mon, 5 Oct 2020 10:19:28 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id A56DA1BF30A for ; Mon, 5 Oct 2020 10:19:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id A27F686FCC for ; Mon, 5 Oct 2020 10:19:25 +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 voG4qR1c2u5S for ; Mon, 5 Oct 2020 10:19:25 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from smtp53.i.mail.ru (smtp53.i.mail.ru [94.100.177.113]) by hemlock.osuosl.org (Postfix) with ESMTPS id 192AC86FAD for ; Mon, 5 Oct 2020 10:19:25 +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:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:From:Subject:Content-Type:Content-Transfer-Encoding:To:Cc; bh=uSad43bnNzLE0arfMrtlXOR6yv9diGndqavmBoyJfP4=; b=VBILaXg20hvOzdwrpiM5mAnP/yvEA5oQlIvxNrvg7cdpGM6JSV6AEqPLVceyQ5NbWBrB9PyHWre0nsfg3G9gFWxgo3xo0NBrDpmeL2vviEMW2+u7uDtf2kPWQM+e9zG8quCj5hHV4STRt2l9gwuFKwKpbHasbgsl4UR1t1mYOu4=; Received: by smtp53.i.mail.ru with esmtpa (envelope-from ) id 1kPNaU-000359-Ug; Mon, 05 Oct 2020 13:19:23 +0300 From: Maxim Kochetkov To: buildroot@buildroot.org Date: Mon, 5 Oct 2020 13:19:50 +0300 Message-Id: <20201005101951.3112095-2-fido_max@inbox.ru> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201005101951.3112095-1-fido_max@inbox.ru> References: <20201005101951.3112095-1-fido_max@inbox.ru> MIME-Version: 1.0 Authentication-Results: smtp53.i.mail.ru; auth=pass smtp.auth=fido_max@inbox.ru smtp.mailfrom=fido_max@inbox.ru X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD9E98D7292067252302C0E76C52979D672675FED68DAFAF9FC182A05F5380850408ED9C39FD38167F0F61BBCE6019DB0802827FB6FA288166A15D7C2BC7737DA53 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE712EB008F780777E9EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637FACF2191C0719DEE8638F802B75D45FF5571747095F342E8C7A0BC55FA0FE5FC62FD9C154AAE7AC5968F56F8440B787632B35A81512DAA7E389733CBF5DBD5E913377AFFFEAFD269176DF2183F8FC7C07E7E81EEA8A9722B8941B15DA834481FCF19DD082D7633A0E7DDDDC251EA7DABA471835C12D1D977725E5C173C3A84C327ED053E960B195E117882F4460429728AD0CFFFB425014EFE57002F862A6B6676E601842F6C81A19E625A9149C048EED76C6ED7039589DE302FCEF25BFAB3454AD6D5ED66289B5218080C068C56568E6136E347CC761E07725E5C173C3A84C35973B86847D985D276E601842F6C81A1F004C90652538430FAAB00FBE355B82D93EC92FD9297F6718AA50765F7900637966444AA411C4A3AA7F4EDE966BC389F395957E7521B51C24C7702A67D5C33162DBA43225CD8A89F00AD5422731CA18C42539A7722CA490CB5C8C57E37DE458B4C7702A67D5C3316FA3894348FB808DB48C21F01D89DB561574AF45C6390F7469DAA53EE0834AAEE X-C8649E89: C4D0E0CCE8065C7910876974D50C95F1CAD7E98D1A3775AD53B13D943617002E9C9C952C353AD91A X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2bioj1bf1uU7Q7Dz/FKlHrQFj3Q== X-Mailru-Internal-Actual: A:0.86402264788663 X-Mailru-Sender: 11C2EC085EDE56FA9C10FA2967F5AB247CAEA1C2DEDD18AAAE918D2B4CA07E5F67DECFD822481F15EE9242D420CFEBFD3DDE9B364B0DF2891A624F84B2C74EDA4239CF2AF0A6D4F80DA7A0AF5A3A8387 X-Mras: Ok Subject: [Buildroot] [PATCH 1/2] package/postgresql: add configure and includedir-server 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: , Cc: Maxim Kochetkov Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 --- 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