From patchwork Thu Dec 28 19:27:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 853537 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Qg/uAqKn"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3z709K6YxYz9sRg for ; Fri, 29 Dec 2017 06:27:33 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 291D72DDDC; Thu, 28 Dec 2017 19:27:31 +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 46zcqYnlH2vs; Thu, 28 Dec 2017 19:27:29 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id D20E92DC52; Thu, 28 Dec 2017 19:27:29 +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 0DCA71BFCC3 for ; Thu, 28 Dec 2017 19:27:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 075062DC59 for ; Thu, 28 Dec 2017 19:27:27 +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 vUwtAysOegQt for ; Thu, 28 Dec 2017 19:27:25 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-yw0-f194.google.com (mail-yw0-f194.google.com [209.85.161.194]) by silver.osuosl.org (Postfix) with ESMTPS id BF3DF2DC52 for ; Thu, 28 Dec 2017 19:27:25 +0000 (UTC) Received: by mail-yw0-f194.google.com with SMTP id r205so8801544ywb.3 for ; Thu, 28 Dec 2017 11:27:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZMjD2SDH6bX4MLvmcipKK/7+yt3ItzZGhvt3PuQUabA=; b=Qg/uAqKnufjlpe46BXjbbILrBJ9pyRLuydfDoiZfGLAVoRkj6C1yJeMjtG5oG3M8ar JF8uIMCL3Pcef0TDnf9wfra4/qfQki5Q6bmDJp84sM1wdJuWJ0uGpNcgPtptb52tUiZw BNhYpskQZcQSsAELnZLcEZ32t/JAzwaz9vIAvf8l1QpVN4ExVDkwE5gRNYF8ZftbcjiI 1Ous+9Q90UDcZ/rH1fYxx3WrygtBV2+QT0nDEycJ+x/USjdU7rjg0hKksIzuNDrPt+Nz PgK1TSpJ5Q8M0zEe8I46U2XPDf8DZh7n2ggJ2NQ0HZKXOo4hhn3CdL5jCDL7tQUWo5Gj KM3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ZMjD2SDH6bX4MLvmcipKK/7+yt3ItzZGhvt3PuQUabA=; b=Tjlr2vtVDzctAB4zSZetfQD6/i2ouL1C+MBzhsyXyJlfFcqqe9G8bpqoz0YuyPIiXJ QYLAIngGcmk23RQmrvr4Ro68aSnZiTmmsvLGXNuBX59KbxTj51Fk6f1Z918j0rIgyhD/ VHewbXwrMDEL+iOQnI/ZFRbiAOTgJTeDRGAJOJ+uMLJtT1zWUET6lAErpYd6HpfheV2n 4B8bcVYciIU+lf0f/uS1u7kkSMpcc4rPDZCch5marQgcEUr4sztnFTFnc5qWeUY1lJ07 1OCbe6Va5H9FxAjCR6did7EIjiM5sKoWq7eWolIL84D0T6GgjcsE3nauql8t9WPPfPNa DlVQ== X-Gm-Message-State: AKGB3mKFExcepMpjC05ZtH/Wznax8HIopEgXFKUp0BjOlxORMV3K5tsK pvKyjHCXTcm6jKyL58Ue/ru67w7+ X-Google-Smtp-Source: ACJfBov/ykcsolsuwrnsmL+sDrKee3KnjGAcdYXitcVPLMo9jejMQWjFxfD1hlnIS343EPMYNfcAZA== X-Received: by 10.129.119.6 with SMTP id s6mr21654985ywc.240.1514489244515; Thu, 28 Dec 2017 11:27:24 -0800 (PST) Received: from aduskett.duskett (68-188-149-81.dhcp.aldl.mi.charter.com. [68.188.149.81]) by smtp.gmail.com with ESMTPSA id p62sm15980378ywc.63.2017.12.28.11.27.23 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Dec 2017 11:27:24 -0800 (PST) From: Adam Duskett X-Google-Original-From: Adam Duskett To: buildroot@buildroot.org Date: Thu, 28 Dec 2017 14:27:18 -0500 Message-Id: <20171228192721.18494-2-Adamduskett@outlook.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20171228192721.18494-1-Adamduskett@outlook.com> References: <20171228192721.18494-1-Adamduskett@outlook.com> Subject: [Buildroot] [PATCH 1/4] libcutl: new package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Adam Duskett MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" libcutl is distributed in source code and includes the standard autotools build system as well as the VC++ project files. It is a dependency for odb. Because ODB is a host-only package, and no other package depends on libcutl, this package will also be a host-only package. Signed-off-by: Adam Duskett --- DEVELOPERS | 1 + package/libcutl/libcutl.hash | 6 ++++++ package/libcutl/libcutl.mk | 15 +++++++++++++++ 3 files changed, 22 insertions(+) create mode 100644 package/libcutl/libcutl.hash create mode 100644 package/libcutl/libcutl.mk diff --git a/DEVELOPERS b/DEVELOPERS index 9f4f282203..a3d00ef892 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -43,6 +43,7 @@ F: package/gstreamer1/gst1-plugins-ugly/ F: package/gstreamer1/gst1-vaapi/ F: package/imx-usb-loader/ F: package/janus-gateway/ +F: package/libcutl/ F: package/libressl/ F: package/libselinux/ F: package/libsemanage/ diff --git a/package/libcutl/libcutl.hash b/package/libcutl/libcutl.hash new file mode 100644 index 0000000000..1e0baa7f6e --- /dev/null +++ b/package/libcutl/libcutl.hash @@ -0,0 +1,6 @@ +# From https://www.codesynthesis.com/download/libcutl/1.10/libcutl-1.10.0.tar.bz2.sha1 +sha1 2885b79529f8caeb13687d722f5c114186f56956 libcutl-1.10.0.tar.bz2 + +# Locally Computed +sha256 125163c670e372b47d5626d54379ff8fbaded6ccd5db77ac0bf5912a4017121c libcutl-1.10.0.tar.bz2 +sha256 c7aa98c5af3b67174f16b12a1fed4332a51cd524b82c69e85baa4c2c412da239 LICENSE diff --git a/package/libcutl/libcutl.mk b/package/libcutl/libcutl.mk new file mode 100644 index 0000000000..49c05e6019 --- /dev/null +++ b/package/libcutl/libcutl.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# libcutl +# +################################################################################ + +LIBCUTL_VERSION_MAJOR = 1.10 +LIBCUTL_VERSION = $(LIBCUTL_VERSION_MAJOR).0 +LIBCUTL_SOURCE = libcutl-$(LIBCUTL_VERSION).tar.bz2 +LIBCUTL_SITE = https://www.codesynthesis.com/download/libcutl/$(LIBCUTL_VERSION_MAJOR) +LIBCUTL_INSTALL_STAGING = YES +LIBCUTL_LICENSE = MIT +LIBCUTL_LICENSE_FILES = LICENSE + +$(eval $(host-autotools-package)) From patchwork Thu Dec 28 19:27:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 853538 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="YpvWBmUD"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3z709M6YX4z9sRW for ; Fri, 29 Dec 2017 06:27:35 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id CA24F874D4; Thu, 28 Dec 2017 19:27:33 +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 OILRbV317+fl; Thu, 28 Dec 2017 19:27:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id A1F258748A; Thu, 28 Dec 2017 19:27:30 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 6A9161BFCC3 for ; Thu, 28 Dec 2017 19:27:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 646F2871AA for ; Thu, 28 Dec 2017 19:27:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6m9HRV0zxSNH for ; Thu, 28 Dec 2017 19:27:27 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-yw0-f193.google.com (mail-yw0-f193.google.com [209.85.161.193]) by whitealder.osuosl.org (Postfix) with ESMTPS id 1294B8708C for ; Thu, 28 Dec 2017 19:27:27 +0000 (UTC) Received: by mail-yw0-f193.google.com with SMTP id k80so8798377ywe.0 for ; Thu, 28 Dec 2017 11:27:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=GSf78X4o20HtpoTRqlXQTsIb0ufFqCW1NHfRalttsQ4=; b=YpvWBmUDSw+BcV8AnD4jhabSTrkeZ9HVHMaxOt4rqhMVoUse/Cf8IAdQd+ODhrkmRt HkrlL5vC3UBVzL1Gv7T4KXQD/Kja7lbibUjo31gUq5C626aKfaJXwYRRz6sQPubr6MV6 gUHXglri6G2Z/Hj0r5b7dqjzh8tH0KXOah6joJL1XhZUx7jx7A/QuXtOwF6WaVNE30UR JH4kHZJW56HYAgSm52aWEeXBEOPTzhFcqXCLDLrpFY0HYgz29RAGoG1Rdtj88BUvSYxT nnxy2/H5S3vzilEwbFOzRYFdamF8oqppjM2HVEr5nQ3Sd2AfL9qNCoLvZkIdJcje6Icy TfmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=GSf78X4o20HtpoTRqlXQTsIb0ufFqCW1NHfRalttsQ4=; b=Op1YWpCCiyt9fGmegJZ1aU9k+J0uN2j9ABRwYRpeg7ReeSNWScVrsIIwRac71xBAhA 3w4bH7vw/nzIaD5rvUo5Yhrnfcp9ZreiABvynNySqFlxZjabDLLdb37qwmK/b1CYABj6 65x3J/7ZOFJ9unxQ1bREV1XngjA8L3aqt1ePGN2bnyzJjI4KUWvP0fHfbKNAxPoENcc+ jih8rEKIH/iUSIgyUzCfWpigSnBZNIAJXXzIVCmhKQ7y+WirDxLf7LLigCv2K2E9iASr TxvxT9CfJNX4s3faO3TcYaaUSyFjOh+3Ma3zmkHd57d+YZUyVJquh8dCFeABkspNZy3h LpUA== X-Gm-Message-State: AKGB3mKzeOHGbLxtVf72GCF0zu1m3bRww5VCekf3si4FcPadLkksFrmz CG8WCUTCaevPk41cnwskbtJ1BoF4 X-Google-Smtp-Source: ACJfBosSsfucSb3exWYiXZwmI8DBs1OLbt4t9INJjm3Jm9u0U9zLHAPobo3+B2twxw/3D7fiq5hKlA== X-Received: by 10.13.211.70 with SMTP id v67mr22041056ywd.206.1514489245557; Thu, 28 Dec 2017 11:27:25 -0800 (PST) Received: from aduskett.duskett (68-188-149-81.dhcp.aldl.mi.charter.com. [68.188.149.81]) by smtp.gmail.com with ESMTPSA id p62sm15980378ywc.63.2017.12.28.11.27.24 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Dec 2017 11:27:24 -0800 (PST) From: Adam Duskett X-Google-Original-From: Adam Duskett To: buildroot@buildroot.org Date: Thu, 28 Dec 2017 14:27:19 -0500 Message-Id: <20171228192721.18494-3-Adamduskett@outlook.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20171228192721.18494-1-Adamduskett@outlook.com> References: <20171228192721.18494-1-Adamduskett@outlook.com> Subject: [Buildroot] [PATCH 2/4] ODB: New package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Adam Duskett MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" ODB is an open-source, cross-platform, and cross-database object-relational mapping (ORM) system for C++. It allows you to persist C++ objects to a relational database without having to deal with tables, columns, or SQL and without manually writing any mapping code. ODB supports MySQL, SQLite, PostgreSQL, Oracle, and Microsoft SQL Server relational databases as well as C++98/03 and C++11 language standards. It also comes with optional profiles for Boost and Qt which allow you to seamlessly use value types, containers, and smart pointers from these libraries in your persistent C++ classes. This package is used for auto-generating ODB specific header files into useable code that can be linked against a seperate libodb and a specific libodb database library. As such, it is only needed as a host program and is not user selectable. Signed-off-by: Adam Duskett --- DEVELOPERS | 1 + .../odb/0001-make-ODB-compatible-with-GCC-6.patch | 327 +++++++++++++++++++++ ...x-bug-in-GCC-6-input_location-translation.patch | 37 +++ package/odb/odb.hash | 6 + package/odb/odb.mk | 20 ++ 5 files changed, 391 insertions(+) create mode 100644 package/odb/0001-make-ODB-compatible-with-GCC-6.patch create mode 100644 package/odb/0002-Fix-bug-in-GCC-6-input_location-translation.patch create mode 100644 package/odb/odb.hash create mode 100644 package/odb/odb.mk diff --git a/DEVELOPERS b/DEVELOPERS index a3d00ef892..f9e25f853c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -49,6 +49,7 @@ F: package/libselinux/ F: package/libsemanage/ F: package/libsepol/ F: package/nginx-naxsi/ +F: package/odb/ F: package/policycoreutils/ F: package/python-mutagen/ F: package/restorecond/ diff --git a/package/odb/0001-make-ODB-compatible-with-GCC-6.patch b/package/odb/0001-make-ODB-compatible-with-GCC-6.patch new file mode 100644 index 0000000000..06f71ed21d --- /dev/null +++ b/package/odb/0001-make-ODB-compatible-with-GCC-6.patch @@ -0,0 +1,327 @@ +From 511dcf67322ad87fb32f97d1cf7725c129e83898 Mon Sep 17 00:00:00 2001 +From: Boris Kolpackov +Date: Fri, 5 Feb 2016 16:01:42 +0200 +Subject: [PATCH] make ODB compatible with GCC 6 + +From: +http://dl.fedoraproject.org/pub/fedora/linux/releases/26/Everything/source/tree/Packages/o/odb-2.4.0-19.fc26.src.rpm + +Original author: Boris Kolpackov +Signed-off-by: Adam Duskett +--- + odb/cxx-lexer.cxx | 4 ++++ + odb/gcc-fwd.hxx | 23 ++++++++++++++++++++++- + odb/gcc.hxx | 13 +++++++++++++ + odb/include.cxx | 31 +++++++++++++++++++++---------- + odb/parser.cxx | 10 ++++++---- + odb/plugin.cxx | 29 +++++++++++++++++++++++++++-- + odb/semantics/elements.cxx | 4 ++-- + 7 files changed, 95 insertions(+), 19 deletions(-) + +diff --git a/odb/cxx-lexer.cxx b/odb/cxx-lexer.cxx +index 7029c7e..64df296 100644 +--- a/odb/cxx-lexer.cxx ++++ b/odb/cxx-lexer.cxx +@@ -135,8 +135,12 @@ cpp_error_callback ( + #if BUILDING_GCC_MAJOR > 4 || BUILDING_GCC_MAJOR == 4 && BUILDING_GCC_MINOR > 5 + int /*reason*/, // Added in GCC 4.6.0. + #endif ++#if BUILDING_GCC_MAJOR <= 5 + location_t, + unsigned int, ++#else ++ rich_location*, ++#endif + char const* msg, + va_list *ap) + { +diff --git a/odb/gcc-fwd.hxx b/odb/gcc-fwd.hxx +index a120f05..618b106 100644 +--- a/odb/gcc-fwd.hxx ++++ b/odb/gcc-fwd.hxx +@@ -7,6 +7,24 @@ + + #include + ++#if BUILDING_GCC_MAJOR >= 6 ++ ++// If we include here, it pulls in all kinds of GCC trouble that ++// "poisons" standard C/C++ declarations; see safe-ctype.h. So instead we ++// are going to "exclude" safe-ctype.h. To compensate, however, we will ++// include it first thing in gcc.hxx. ++// ++# include ++# define SAFE_CTYPE_H ++# include ++# undef SAFE_CTYPE_H ++# include ++ ++typedef unsigned int source_location; // ++typedef source_location location_t; // ++ ++#else // GCC < 6 ++ + #if BUILDING_GCC_MAJOR > 4 || BUILDING_GCC_MAJOR == 4 && BUILDING_GCC_MINOR > 8 + # include // CHAR_BIT + # include +@@ -33,6 +51,9 @@ extern "C" + + typedef unsigned int source_location; // + typedef source_location location_t; // +-} ++ ++} // extern "C" ++ ++#endif + + #endif // ODB_GCC_FWD_HXX +diff --git a/odb/gcc.hxx b/odb/gcc.hxx +index 504b59b..f91db49 100644 +--- a/odb/gcc.hxx ++++ b/odb/gcc.hxx +@@ -7,6 +7,13 @@ + + #include + ++// Actually, let's keep it out. With it included we can compile in C++98 ++// but not in C++14 (GCC 6 default). ++// ++// #if BUILDING_GCC_MAJOR >= 6 ++// # include // See gcc-fwd.hxx. ++// #endif ++ + // GCC header includes to get the plugin and parse tree declarations. + // The order is important and doesn't follow any kind of logic. + // +@@ -147,4 +154,10 @@ gcc_tree_code_name (gcc_tree_code_type tc) {return tree_code_name[tc];} + #define DECL_CHAIN(x) TREE_CHAIN(x) + #endif + ++// In GCC 6, ANON_AGGRNAME_P became anon_aggrname_p(). ++// ++#if BUILDING_GCC_MAJOR < 6 ++# define anon_aggrname_p(X) ANON_AGGRNAME_P(X) ++#endif ++ + #endif // ODB_GCC_HXX +diff --git a/odb/include.cxx b/odb/include.cxx +index c397993..08c93ce 100644 +--- a/odb/include.cxx ++++ b/odb/include.cxx +@@ -30,9 +30,18 @@ namespace + path path_; + }; + ++#if BUILDING_GCC_MAJOR >= 6 ++ typedef line_map_ordinary line_map_type; ++#else ++ typedef line_map line_map_type; ++# ifndef linemap_check_ordinary ++# define linemap_check_ordinary(X) (X) ++# endif ++#endif ++ + struct includes + { +- typedef std::map map_type; ++ typedef std::map map_type; + bool trailing; // Included at the beginning or at the end of the main file. + map_type map; + }; +@@ -144,7 +153,9 @@ namespace + // + if (l > BUILTINS_LOCATION) + { +- line_map const* lm (linemap_lookup (line_table, l)); ++ line_map_type const* lm ( ++ linemap_check_ordinary ( ++ linemap_lookup (line_table, l))); + + if (lm != 0 && !MAIN_FILE_P (lm)) + { +@@ -537,20 +548,20 @@ namespace + // + #if BUILDING_GCC_MAJOR == 4 && BUILDING_GCC_MINOR <= 6 + size_t used (line_table->used); +- line_map const* maps (line_table->maps); ++ line_map_type const* maps (line_table->maps); + #else + size_t used (line_table->info_ordinary.used); +- line_map const* maps (line_table->info_ordinary.maps); ++ line_map_type const* maps (line_table->info_ordinary.maps); + #endif + + for (size_t i (0); i < used; ++i) + { +- line_map const* m (maps + i); ++ line_map_type const* m (maps + i); + + if (MAIN_FILE_P (m) || m->reason != LC_ENTER) + continue; + +- line_map const* ifm (INCLUDED_FROM (line_table, m)); ++ line_map_type const* ifm (INCLUDED_FROM (line_table, m)); + + #if BUILDING_GCC_MAJOR == 4 && BUILDING_GCC_MINOR <= 6 + path f (m->to_file); +@@ -580,7 +591,7 @@ namespace + for (includes::iterator j (i->second.begin ()); + j != i->second.end (); ++j) + { +- line_map const* lm (j->first); ++ line_map_type const* lm (j->first); + cerr << '\t' << lm->to_file << ":" << LAST_SOURCE_LINE (lm) << endl; + } + */ +@@ -589,13 +600,13 @@ namespace + // it is preferred over all others. Use the first one if there are + // several. + // +- line_map const* main_lm (0); ++ line_map_type const* main_lm (0); + include_directive* main_inc (0); + + for (includes::map_type::iterator j (i->second.map.begin ()); + j != i->second.map.end (); ++j) + { +- line_map const* lm (j->first); ++ line_map_type const* lm (j->first); + + if (MAIN_FILE_P (lm)) + { +@@ -636,7 +647,7 @@ namespace + for (includes::map_type::iterator j (i->second.map.begin ()); + j != i->second.map.end (); ++j) + { +- line_map const* lm (j->first); ++ line_map_type const* lm (j->first); + + #if BUILDING_GCC_MAJOR == 4 && BUILDING_GCC_MINOR <= 6 + string f (lm->to_file); +diff --git a/odb/parser.cxx b/odb/parser.cxx +index a8e6a6a..a9d22fb 100644 +--- a/odb/parser.cxx ++++ b/odb/parser.cxx +@@ -1044,14 +1044,14 @@ emit_type_decl (tree decl) + // says that in typedef struct {} S; S becomes struct's + // name. + // +- if (ANON_AGGRNAME_P (decl_name)) ++ if (anon_aggrname_p (decl_name)) + { + tree d (TYPE_NAME (t)); + + if (d != NULL_TREE && + !DECL_ARTIFICIAL (d) && + DECL_NAME (d) != NULL_TREE && +- !ANON_AGGRNAME_P (DECL_NAME (d))) ++ !anon_aggrname_p (DECL_NAME (d))) + { + decl = d; + decl_name = DECL_NAME (decl); +@@ -1668,7 +1668,7 @@ create_type (tree t, + ts << "start anon/stub " << gcc_tree_code_name(tc) << " at " + << file << ":" << line << endl; + +- if (d == NULL_TREE || ANON_AGGRNAME_P (DECL_NAME (d))) ++ if (d == NULL_TREE || anon_aggrname_p (DECL_NAME (d))) + { + if (tc == RECORD_TYPE) + r = &emit_class (t, file, line, clmn); +@@ -1765,7 +1765,7 @@ create_type (tree t, + ts << "start anon/stub " << gcc_tree_code_name(tc) << " at " + << file << ":" << line << endl; + +- if (d == NULL_TREE || ANON_AGGRNAME_P (DECL_NAME (d))) ++ if (d == NULL_TREE || anon_aggrname_p (DECL_NAME (d))) + { + r = &emit_enum (t, access, file, line, clmn); + } +@@ -1831,6 +1831,8 @@ create_type (tree t, + // the array type. In other words, we view it as "constant array" + // rather than "array of constant elements". + // ++ using semantics::array; // vs std::array. ++ + tree bt (TREE_TYPE (t)); + tree bt_mv (TYPE_MAIN_VARIANT (bt)); + type& bt_node (emit_type (bt_mv, access::public_, file, line, clmn)); +diff --git a/odb/plugin.cxx b/odb/plugin.cxx +index e32f225..3aeaa3c 100644 +--- a/odb/plugin.cxx ++++ b/odb/plugin.cxx +@@ -45,14 +45,28 @@ path file_; // File being compiled. + paths inputs_; // List of input files in at-once mode or just file_. + + bool (*cpp_error_prev) ( +- cpp_reader*, int, int, location_t, unsigned int, const char*, va_list*); ++ cpp_reader*, ++ int, ++ int, ++#if BUILDING_GCC_MAJOR >= 6 ++ rich_location*, ++#else ++ location_t, ++ unsigned int, ++#endif ++ const char*, ++ va_list*); + + static bool + cpp_error_filter (cpp_reader* r, + int level, + int reason, ++#if BUILDING_GCC_MAJOR >= 6 ++ rich_location* l, ++#else + location_t l, + unsigned int column_override, ++#endif + const char* msg, + va_list* ap) + { +@@ -66,7 +80,18 @@ cpp_error_filter (cpp_reader* r, + if (strstr (msg, "#pragma once") != 0) + return true; + +- return cpp_error_prev (r, level, reason, l, column_override, msg, ap); ++ return cpp_error_prev ( ++ r, ++ level, ++ reason, ++#if BUILDING_GCC_MAJOR >= 6 ++ l, ++#else ++ l, ++ column_override, ++#endif ++ msg, ++ ap); + } + + // A prefix of the _cpp_file struct. This struct is not part of the +diff --git a/odb/semantics/elements.cxx b/odb/semantics/elements.cxx +index 21e3260..399d5e9 100644 +--- a/odb/semantics/elements.cxx ++++ b/odb/semantics/elements.cxx +@@ -59,7 +59,7 @@ namespace semantics + if (tree decl = TYPE_NAME (n)) + name = DECL_NAME (decl); + +- return name != 0 && ANON_AGGRNAME_P (name); ++ return name != 0 && anon_aggrname_p (name); + } + + return true; +@@ -108,7 +108,7 @@ namespace semantics + if (tree decl = TYPE_NAME (type)) + { + name = DECL_NAME (decl); +- if (name != 0 && ANON_AGGRNAME_P (name)) ++ if (name != 0 && anon_aggrname_p (name)) + return true; + + tree s (CP_DECL_CONTEXT (decl)); +-- +2.14.3 + diff --git a/package/odb/0002-Fix-bug-in-GCC-6-input_location-translation.patch b/package/odb/0002-Fix-bug-in-GCC-6-input_location-translation.patch new file mode 100644 index 0000000000..c2bb37d3c0 --- /dev/null +++ b/package/odb/0002-Fix-bug-in-GCC-6-input_location-translation.patch @@ -0,0 +1,37 @@ +From ec777147024fde72e4411cc6b1e1e49f4a1d1804 Mon Sep 17 00:00:00 2001 +From: Boris Kolpackov +Date: Fri, 23 Dec 2016 10:18:01 +0200 +Subject: [PATCH] Fix bug in GCC 6 input_location translation + +From: +http://dl.fedoraproject.org/pub/fedora/linux/releases/26/Everything/source/tree/Packages/o/odb-2.4.0-19.fc26.src.rpm + +Original author: Boris Kolpackov +Signed-off-by: Adam Duskett +--- + odb/cxx-lexer.cxx | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/odb/cxx-lexer.cxx b/odb/cxx-lexer.cxx +index 64df296..ae045d9 100644 +--- a/odb/cxx-lexer.cxx ++++ b/odb/cxx-lexer.cxx +@@ -106,7 +106,15 @@ next (string& token, tree* node) + location_t cxx_pragma_lexer:: + location () const + { ++ // Starting from GCC 6 the input location seem to require the same ++ // translation as what we do in real_source_location(). ++ // ++#if BUILDING_GCC_MAJOR >= 6 ++ return linemap_resolve_location ( ++ line_table, input_location, LRK_MACRO_EXPANSION_POINT, 0); ++#else + return input_location; ++#endif + } + + string cxx_pragma_lexer:: +-- +2.14.3 + diff --git a/package/odb/odb.hash b/package/odb/odb.hash new file mode 100644 index 0000000000..773a9c829b --- /dev/null +++ b/package/odb/odb.hash @@ -0,0 +1,6 @@ +# From https://www.codesynthesis.com/products/odb/download.xhtml +sha1 810fc02e591429ed19f5a2699d144fb611fb121b odb-2.4.0.tar.bz2 + +# Locally computed +sha256 6785154fa98ea3977c8c2ab38cec16c4aa78c2c2039e80cd2908347b1c1d4198 odb-2.4.0.tar.bz2 +sha256 7983b82cb1f1686ac2b55420ded9c0f348f93dd17bf3e048ae3b25c1da51b80e LICENSE diff --git a/package/odb/odb.mk b/package/odb/odb.mk new file mode 100644 index 0000000000..b6dcfe8e9b --- /dev/null +++ b/package/odb/odb.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# odb +# +################################################################################ + +ODB_VERSION_MAJOR = 2.4 +ODB_VERSION = $(ODB_VERSION_MAJOR).0 +ODB_SOURCE = odb-$(ODB_VERSION).tar.bz2 +ODB_SITE = https://www.codesynthesis.com/download/odb/$(ODB_VERSION_MAJOR) +ODB_LICENSE = MIT +ODB_LICENSE_FILES = LICENSE +HOST_ODB_DEPENDENCIES = host-libcutl + +# Prevent odb from trying to install the gcc plugin into the hosts +# gcc plugin directory. Instead, this will install the gcc plugin +# into host/libexec/odb +HOST_ODB_CONF_OPTS = --with-gcc-plugin-dir=no + +$(eval $(host-autotools-package)) From patchwork Thu Dec 28 19:27:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 853540 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="hbCDZFLA"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3z709X5l6kz9sRW for ; Fri, 29 Dec 2017 06:27:44 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B1141874C7; Thu, 28 Dec 2017 19:27:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MyNVceVV3-6u; Thu, 28 Dec 2017 19:27:36 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 8D4E786E3E; Thu, 28 Dec 2017 19:27:36 +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 883E61BFCC3 for ; Thu, 28 Dec 2017 19:27:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 817A887472 for ; Thu, 28 Dec 2017 19:27:29 +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 yK-RbneofHF4 for ; Thu, 28 Dec 2017 19:27:28 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-yw0-f195.google.com (mail-yw0-f195.google.com [209.85.161.195]) by hemlock.osuosl.org (Postfix) with ESMTPS id 8A65087489 for ; Thu, 28 Dec 2017 19:27:27 +0000 (UTC) Received: by mail-yw0-f195.google.com with SMTP id q26so8803095ywa.6 for ; Thu, 28 Dec 2017 11:27:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=eFQgRp3469uAlipp1HnHuu+yTewYw3rI/tVF2mtnEag=; b=hbCDZFLA5sjTcURLq3X47K2Sksd2Igb43AAHxS03MwRMIZhvEYuZpBi3HigEEGEHdY fcaZiG7XZ+bb4PsUaWUS2HrsZcg+EqmJPsoYmSZ3v4MtkeHSVpzNp1CexB0nCf2L0+vS 5uosojY6joa1tRcwEMZBgkPbH19n9SbxcbaoVy+GpLQcMSwx8oT4Ap/x3aiR6megbC9W WiY3yfIo72xrXoYqTrGsHn1TpvekN3IndM862hmACvaDaciU5O5YgVmoeBj2U4IRUIkv saV8Xvff2hhkxHSWlJ/N7PTBpHliR0Uivg51d3Sh6j3BMKE1uCqfy62Nq6qvF9VqVeRz tNfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=eFQgRp3469uAlipp1HnHuu+yTewYw3rI/tVF2mtnEag=; b=mpVrhoTrsO6gQpBuG4wMNJjGfVXSRwHuig9eMpJPewNdqpOR7WnnHCtsEojaWypWUp e615JVPVvJja3+pP+VBMa5uQfawteTIyeo27rT1H4qYWkbHR5FD5NIqjQ11GHXl0yVpL 2soFbgo/8zjTHHknkzeTOOouJwcT0bgA0qgOYQfc6XP36WFGxjpXxkGyj9gFF9kG422s d8yz/Dpv6bTcRQ2k6qoWCDuzduZUaZ4NX2a8KRdCClQfKwSbhffpZtd0uL4xfY2cokQ8 Uxny/1LqobcZZGe8Ux4yvrBRURk5PTNwhjT+8zHbKYpwANBKwO+nV+w/SaTT/FG79wXJ 0teg== X-Gm-Message-State: AKGB3mKReHUaUPtQpeJvk3SFUZY9P9UZ9+x69r4acXdD+KQ4pS3Lgdz8 MuV58ncO0WnN7B13KsPWjOQa187n X-Google-Smtp-Source: ACJfBot+qaVW2nx4zogaNjVY7kzQ/q9ADgzhdfKtz4iYaZqVYBIyt2Mh1pDF2uxn1pgcTJMNtUcqJg== X-Received: by 10.13.212.79 with SMTP id w76mr22654039ywd.220.1514489246237; Thu, 28 Dec 2017 11:27:26 -0800 (PST) Received: from aduskett.duskett (68-188-149-81.dhcp.aldl.mi.charter.com. [68.188.149.81]) by smtp.gmail.com with ESMTPSA id p62sm15980378ywc.63.2017.12.28.11.27.25 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Dec 2017 11:27:25 -0800 (PST) From: Adam Duskett X-Google-Original-From: Adam Duskett To: buildroot@buildroot.org Date: Thu, 28 Dec 2017 14:27:20 -0500 Message-Id: <20171228192721.18494-4-Adamduskett@outlook.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20171228192721.18494-1-Adamduskett@outlook.com> References: <20171228192721.18494-1-Adamduskett@outlook.com> Subject: [Buildroot] [PATCH 3/4] libodb: new package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Adam Duskett MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This package contains the common ODB runtime library. Every application that includes code generated by the ODB compiler will need to link to this library. Signed-off-by: Adam Duskett --- DEVELOPERS | 1 + package/Config.in | 1 + package/libodb/Config.in | 12 ++++++++++++ package/libodb/libodb.hash | 6 ++++++ package/libodb/libodb.mk | 16 ++++++++++++++++ 5 files changed, 36 insertions(+) create mode 100644 package/libodb/Config.in create mode 100644 package/libodb/libodb.hash create mode 100644 package/libodb/libodb.mk diff --git a/DEVELOPERS b/DEVELOPERS index f9e25f853c..ca28d0be50 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -44,6 +44,7 @@ F: package/gstreamer1/gst1-vaapi/ F: package/imx-usb-loader/ F: package/janus-gateway/ F: package/libcutl/ +F: package/libodb/ F: package/libressl/ F: package/libselinux/ F: package/libsemanage/ diff --git a/package/Config.in b/package/Config.in index bd39a374f0..c7b80af455 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1484,6 +1484,7 @@ menu "Other" source "package/libloki/Config.in" source "package/libnpth/Config.in" source "package/libnspr/Config.in" + source "package/libodb/Config.in" source "package/libpfm4/Config.in" source "package/libplatform/Config.in" source "package/libplist/Config.in" diff --git a/package/libodb/Config.in b/package/libodb/Config.in new file mode 100644 index 0000000000..d5481453df --- /dev/null +++ b/package/libodb/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_LIBODB + bool "libodb" + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_INSTALL_LIBSTDCPP + help + This package contains the common ODB runtime library. Every + application that includes code generated by the ODB compiler + will need to link to this library. + + https://www.codesynthesis.com/products/odb/ + +comment "libodb needs a toolchain w/ C++, threads" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libodb/libodb.hash b/package/libodb/libodb.hash new file mode 100644 index 0000000000..cea5b9eda2 --- /dev/null +++ b/package/libodb/libodb.hash @@ -0,0 +1,6 @@ +# From https://www.codesynthesis.com/projects/libcutl/ +sha1 42bd2a8023e338e004711e755eb30bd122b844a6 libodb-2.4.0.tar.bz2 + +# Locally Computed +sha256 66a1bb4e8bb6ef60cc79334f8028c4d4de98d87f2ff6f8123b4cfb7751ce0007 libodb-2.4.0.tar.bz2 +sha256 841105a470fc283851c63941510ffd403c726d1910b688f7df95914ab8b1b5a3 LICENSE diff --git a/package/libodb/libodb.mk b/package/libodb/libodb.mk new file mode 100644 index 0000000000..6aebd14ce9 --- /dev/null +++ b/package/libodb/libodb.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# libodb +# +################################################################################ + +LIBODB_VERSION_MAJOR = 2.4 +LIBODB_VERSION = $(LIBODB_VERSION_MAJOR).0 +LIBODB_SOURCE = libodb-$(LIBODB_VERSION).tar.bz2 +LIBODB_SITE = https://www.codesynthesis.com/download/odb/$(LIBODB_VERSION_MAJOR) +LIBODB_INSTALL_STAGING = YES +LIBODB_LICENSE = MIT +LIBODB_LICENSE_FILES = LICENSE +LIBODB_DEPENDENCIES = host-odb + +$(eval $(autotools-package)) From patchwork Thu Dec 28 19:27:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 853539 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="t9k6y7Iw"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3z709Q75SKz9sRW for ; Fri, 29 Dec 2017 06:27:38 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D22292E1D9; Thu, 28 Dec 2017 19:27:36 +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 UXARcIKDczH8; Thu, 28 Dec 2017 19:27:35 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 849452CE90; Thu, 28 Dec 2017 19:27:35 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 5DBFF1BFCC3 for ; Thu, 28 Dec 2017 19:27:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5B17386D7B for ; Thu, 28 Dec 2017 19:27: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 JAqGMlrbXWwF for ; Thu, 28 Dec 2017 19:27:28 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-yw0-f193.google.com (mail-yw0-f193.google.com [209.85.161.193]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 5648186D79 for ; Thu, 28 Dec 2017 19:27:28 +0000 (UTC) Received: by mail-yw0-f193.google.com with SMTP id n25so8805017ywh.10 for ; Thu, 28 Dec 2017 11:27:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nwehvMt9AGmc0/2xMKyDA42DUHVxJiOXdY/NxhCswy8=; b=t9k6y7IwNsZCf5z4otuqi9cOXoagJnSCmKf2PNnTPONmFM9NrLsIXM9g+WLzm2SbBT ubx4Lzb10Q5yqeNuszTmdT3jXRKn0DwfL59bOQ+Zy7kTNZROfd9mJtJ1+IGAU01fR5co cqBjSwz6vXnqqoCsGU1pE3DhVyPd0ocjt8v0I+fr3/2q7YWeixvSKScjkttnvh+bNF4u oowl7IwKfx96x4VC/E5CxAHDYWzXQra82T1S6o8DjDqht64LswQ2DvCa7lBitSRxBi0J CnfTkn6ZKdtyGw9td+g9QPrIPm1lxkQTrI6zeUvMtuM1kkVqUn7JBH0DoFI3NumMni7w 9JqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=nwehvMt9AGmc0/2xMKyDA42DUHVxJiOXdY/NxhCswy8=; b=cmjDT4b01PrKwIdbffF3X2sdWs2zdpuKRlGGT+mtGzOv/SAoRYqBRoLuMRjzJ5d5au sizjrIM8a744j1Gh6ArckULMOYy1hQnLpVUZ6ai2cvJoj6gND70DcmNndQnXEX4oVbGr XJX275c7o0yrvx7v1+MfS7xDyBcIJ64098lWS08+3RbZFCbRyjWL3IwmKdD1iLE+FjK9 1f6ua+Mp+hQ7bc8P8ji6A0Xh6MWj9Aa9mCSZbWKpwdS53QaOOLBY2o6CoyKhRpUCt08v l6Yg7YFBn8GS1i9wkUmO2QC8bwBtzaMlTzpy+xRuCo0t+swcfQx74DBXQ2BqpaYWzNXO Fa5w== X-Gm-Message-State: AKGB3mKhyuFURs7a2M18jc8I1j/G9HfCU83BtsEDn1B6xpL7y/IpAP7Z eDcx/ASfMGa39EhxR8pNy6OMNSUV X-Google-Smtp-Source: ACJfBovdq0KADbI3B6kJ/F3/iPkPM2+0+y7Sh8MWsJf8YU7le4HiC1N0so/H8wEr2xsu+0pil2rjvQ== X-Received: by 10.129.28.204 with SMTP id c195mr21697101ywc.25.1514489247164; Thu, 28 Dec 2017 11:27:27 -0800 (PST) Received: from aduskett.duskett (68-188-149-81.dhcp.aldl.mi.charter.com. [68.188.149.81]) by smtp.gmail.com with ESMTPSA id p62sm15980378ywc.63.2017.12.28.11.27.26 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Dec 2017 11:27:26 -0800 (PST) From: Adam Duskett X-Google-Original-From: Adam Duskett To: buildroot@buildroot.org Date: Thu, 28 Dec 2017 14:27:21 -0500 Message-Id: <20171228192721.18494-5-Adamduskett@outlook.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20171228192721.18494-1-Adamduskett@outlook.com> References: <20171228192721.18494-1-Adamduskett@outlook.com> Subject: [Buildroot] [PATCH 4/4] libodb-pgsql: new package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Adam Duskett MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This package contains the PostgreSQL ODB runtime library. Every application that includes code generated for the PostgreSQL database will need to link to this library. Signed-off-by: Adam Duskett --- DEVELOPERS | 1 + package/Config.in | 1 + package/libodb-pgsql/Config.in | 15 +++++++++++++++ package/libodb-pgsql/libodb-pgsql.hash | 6 ++++++ package/libodb-pgsql/libodb-pgsql.mk | 16 ++++++++++++++++ 5 files changed, 39 insertions(+) create mode 100644 package/libodb-pgsql/Config.in create mode 100644 package/libodb-pgsql/libodb-pgsql.hash create mode 100644 package/libodb-pgsql/libodb-pgsql.mk diff --git a/DEVELOPERS b/DEVELOPERS index ca28d0be50..eb67a6a023 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -45,6 +45,7 @@ F: package/imx-usb-loader/ F: package/janus-gateway/ F: package/libcutl/ F: package/libodb/ +F: package/libodb-pgsql/ F: package/libressl/ F: package/libselinux/ F: package/libsemanage/ diff --git a/package/Config.in b/package/Config.in index c7b80af455..0a8f04af13 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1060,6 +1060,7 @@ menu "Database" source "package/hiredis/Config.in" source "package/kompexsqlite/Config.in" source "package/leveldb/Config.in" + source "package/libodb-pgsql/Config.in" source "package/libpqxx/Config.in" source "package/mongodb/Config.in" source "package/mysql/Config.in" diff --git a/package/libodb-pgsql/Config.in b/package/libodb-pgsql/Config.in new file mode 100644 index 0000000000..28a17a7cee --- /dev/null +++ b/package/libodb-pgsql/Config.in @@ -0,0 +1,16 @@ +config BR2_PACKAGE_LIBODB_PGSQL + bool "libodb-pgsql" + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_PACKAGE_POSTGRESQL + select BR2_PACKAGE_LIBODB + help + This package contains the PostgreSQL ODB runtime library. + Every application that includes code generated for the + PostgreSQL database will need to link to this library. + + https://www.codesynthesis.com/products/odb/ + +comment "libodb-pgsql needs a toolchain w/ C++, threads" + depends on BR2_PACKAGE_POSTGRESQL + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libodb-pgsql/libodb-pgsql.hash b/package/libodb-pgsql/libodb-pgsql.hash new file mode 100644 index 0000000000..5799f09236 --- /dev/null +++ b/package/libodb-pgsql/libodb-pgsql.hash @@ -0,0 +1,6 @@ +# From https://www.codesynthesis.com/download/odb/2.4/libodb-pgsql-2.4.0.tar.bz2.sha1 +sha1 4628d5e296da01dbaf8658fd402b4f709f30ea2d libodb-pgsql-2.4.0.tar.bz2 + +# Locally Computed +sha256 778a4d38bd1161e1f0b368815514c3335da20c7584e3d07613526dcce53523bc libodb-pgsql-2.4.0.tar.bz2 +sha256 841105a470fc283851c63941510ffd403c726d1910b688f7df95914ab8b1b5a3 LICENSE diff --git a/package/libodb-pgsql/libodb-pgsql.mk b/package/libodb-pgsql/libodb-pgsql.mk new file mode 100644 index 0000000000..fd95439d7d --- /dev/null +++ b/package/libodb-pgsql/libodb-pgsql.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# libodb-pgsql +# +################################################################################ + +LIBODB_PGSQL_VERSION_MAJOR = 2.4 +LIBODB_PGSQL_VERSION = $(LIBODB_PGSQL_VERSION_MAJOR).0 +LIBODB_PGSQL_SOURCE = libodb-pgsql-$(LIBODB_PGSQL_VERSION).tar.bz2 +LIBODB_PGSQL_SITE = https://www.codesynthesis.com/download/odb/$(LIBODB_PGSQL_VERSION_MAJOR) +LIBODB_PGSQL_DEPENDENCIES += postgresql libodb +LIBODB_PGSQL_LICENSE = MIT +LIBODB_PGSQL_LICENSE_FILES = LICENSE +LIBODB_PGSQL_INSTALL_STAGING = YES + +$(eval $(autotools-package))