From patchwork Sun Mar 5 21:28:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 735486 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 3vbwyQ1N7lz9s7t for ; Mon, 6 Mar 2017 08:28:30 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="KY8EIZIW"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 8ACFA31099; Sun, 5 Mar 2017 21:28:28 +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 d1BMMzeibn4o; Sun, 5 Mar 2017 21:28:27 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id BDD5B307E9; Sun, 5 Mar 2017 21:28:26 +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 B46E51C10C1 for ; Sun, 5 Mar 2017 21:28:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8C9DE89D66 for ; Sun, 5 Mar 2017 21:28:25 +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 rLlPOZbyBLb6 for ; Sun, 5 Mar 2017 21:28:24 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by whitealder.osuosl.org (Postfix) with ESMTPS id A1C4E89539 for ; Sun, 5 Mar 2017 21:28:24 +0000 (UTC) Received: by mail-wr0-f194.google.com with SMTP id u48so19574652wrc.1 for ; Sun, 05 Mar 2017 13:28:24 -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; bh=2/OchEPFDYBGMQATXb56tPMceqBs4g19iSCuhTdMJbo=; b=KY8EIZIWItyd0XqLX0kzqw31tFomMvjyUPJCmo+oc4n2QYDgN7NTd28CR/eZ1ctqtW EM8PtCEEt7RvMl8M2y9greHYyq80kk0LRPGJ7dFN2Q4FTIeeipxO5NofHed5TjCqY4A2 PYtEzJYoRIojAiG9RtTA4RPJyaYERiBj/oGJJZvOgyrSEW3Role7QWQdOHEtaJSyJ1WM 5ID5MaCkIkiXpUFxVUNz9qx0C2i/PyrnDy5Tdn8HXv+VjmPMr1Q5GyBKwQD2l3NL7H9n g2RI2ApwzADEgvwEX7Xwrkj0K5xdVEVb1/Ne0fjsHnC0tTHQwrrnBw5zL04kkb8awavl C1LQ== 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; bh=2/OchEPFDYBGMQATXb56tPMceqBs4g19iSCuhTdMJbo=; b=JbEikn/kHtbahgpyUA8/UDix2NHmuYPN6ObZy16qmOqqC6rLNs8fH1vCOcBS3B/y6T 9hvJNROsx0M2og6al4vbzb1/VUCgvnSVC6WAIkmZN6gQosParUkkTlt0+nu/ROKP5kQQ uCKL9SS3yMsLPVQXByt4leQB60frSccdtgYq3A0mB+axV8XvqMICkALFTUcVoUHYmzGs ifGbZxMEdTUguwUSHYvTa2TWVAjUJGwvKeU8+xk+W2msqkzlvHOvHQB4svb4aKHgB/Td fFS3XHtKA8tvlS5IIE8cBqPIYPtm59Eoy7v1XWYvoPs70O432mX9nTQpFu76cu3nrqSO Zdeg== X-Gm-Message-State: AMke39lB5vndLCm09x7q0GFX3VC0j4oCDufqHMhKc+lrzRnEF5kuul/zmnuOIV/b9Z0Y/w== X-Received: by 10.223.169.1 with SMTP id u1mr11434020wrc.53.1488749302923; Sun, 05 Mar 2017 13:28:22 -0800 (PST) Received: from localhost.localdomain (gam75-1-81-57-22-125.fbx.proxad.net. [81.57.22.125]) by smtp.gmail.com with ESMTPSA id m201sm12276516wmd.19.2017.03.05.13.28.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 05 Mar 2017 13:28:22 -0800 (PST) From: Romain Naour To: buildroot@buildroot.org Date: Sun, 5 Mar 2017 22:28:17 +0100 Message-Id: <20170305212818.12594-1-romain.naour@gmail.com> X-Mailer: git-send-email 2.9.3 Cc: Romain Naour Subject: [Buildroot] [PATCH v4 1/2] package/physfs: new package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Backport a patch from SuperTux project: https://github.com/SuperTux/physfs/commit/61d3b63abcba8e9615dcb8a3d1fc026bf7f8d5f8 Signed-off-by: Romain Naour --- v4: add missing license infos Complete lzma license infos (ThomasP) v3: new patch --- DEVELOPERS | 1 + package/Config.in | 1 + .../physfs/0001-Fix-builds-with-modern-GCC.patch | 38 ++++++++++++++++++++++ package/physfs/Config.in | 10 ++++++ package/physfs/physfs.mk | 30 +++++++++++++++++ 5 files changed, 80 insertions(+) create mode 100644 package/physfs/0001-Fix-builds-with-modern-GCC.patch create mode 100644 package/physfs/Config.in create mode 100644 package/physfs/physfs.mk diff --git a/DEVELOPERS b/DEVELOPERS index ed530e2..2cb1c51 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1301,6 +1301,7 @@ F: package/linux-syscall-support/ F: package/lugaru/ F: package/mcelog/ F: package/openpowerlink/ +F: package/physfs/ F: package/stress-ng/ F: package/terminology/ F: package/upower/ diff --git a/package/Config.in b/package/Config.in index 4e39bfb..6ecf04f 100644 --- a/package/Config.in +++ b/package/Config.in @@ -975,6 +975,7 @@ menu "Filesystem" source "package/libnfs/Config.in" source "package/libsysfs/Config.in" source "package/lockdev/Config.in" + source "package/physfs/Config.in" endmenu menu "Graphics" diff --git a/package/physfs/0001-Fix-builds-with-modern-GCC.patch b/package/physfs/0001-Fix-builds-with-modern-GCC.patch new file mode 100644 index 0000000..710b4ff --- /dev/null +++ b/package/physfs/0001-Fix-builds-with-modern-GCC.patch @@ -0,0 +1,38 @@ +From 61d3b63abcba8e9615dcb8a3d1fc026bf7f8d5f8 Mon Sep 17 00:00:00 2001 +From: Jacob Burroughs +Date: Thu, 23 Jun 2016 13:03:47 -0500 +Subject: [PATCH] Fix builds with modern GCC + +From SuperTux project: +https://github.com/SuperTux/physfs/commit/61d3b63abcba8e9615dcb8a3d1fc026bf7f8d5f8 + +Signed-off-by: Romain Naour +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2a371af..94c4844 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -50,7 +50,7 @@ endif() + # Add some gcc-specific command lines. + if(CMAKE_COMPILER_IS_GNUCC) + # Always build with debug symbols...you can strip it later. +- add_definitions(-g -pipe -Werror -fsigned-char) ++ add_definitions(-g -pipe -fsigned-char) + + # Stupid BeOS generates warnings in the system headers. + if(NOT BEOS) +@@ -304,7 +304,7 @@ if(PHYSFS_BUILD_TEST) + if(READLINE_LIBRARY) + set(HAVE_SYSTEM_READLINE TRUE) + set(TEST_PHYSFS_LIBS ${TEST_PHYSFS_LIBS} ${READLINE_LIBRARY} ${CURSES_LIBRARY}) +- include_directories(${READLINE_H} ${HISTORY_H}) ++ include_directories(SYSTEM ${READLINE_H} ${HISTORY_H}) + add_definitions(-DPHYSFS_HAVE_READLINE=1) + endif() + endif() +-- +2.9.3 + diff --git a/package/physfs/Config.in b/package/physfs/Config.in new file mode 100644 index 0000000..dad3ab4 --- /dev/null +++ b/package/physfs/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_PHYSFS + bool "physfs" + depends on BR2_INSTALL_LIBSTDCPP + help + PhysicsFS; a portable, flexible file i/o abstraction. + + http://icculus.org/physfs + +comment "physfs needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/physfs/physfs.mk b/package/physfs/physfs.mk new file mode 100644 index 0000000..0765a6f --- /dev/null +++ b/package/physfs/physfs.mk @@ -0,0 +1,30 @@ +################################################################################ +# +# physfs +# +################################################################################ + +PHYSFS_VERSION = be27dfd07d97336145e7f49d3fd200a6e902f85e +PHYSFS_SITE = https://hg.icculus.org/icculus/physfs +PHYSFS_SITE_METHOD = hg + +PHYSFS_LICENSE = zlib license (physfs), LGPLv2.1+ or CPL or special license (lzma) +PHYSFS_LICENSE_FILES = LICENSE.txt src/lzma/LGPL.txt + +PHYSFS_INSTALL_STAGING = YES + +PHYSFS_CONF_OPTS = -DPHYSFS_BUILD_TEST=OFF + +ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y) +PHYSFS_CONF_OPTS += -DPHYSFS_BUILD_SHARED=ON +else +PHYSFS_CONF_OPTS += -DPHYSFS_BUILD_SHARED=OFF +endif + +ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y) +PHYSFS_CONF_OPTS += -DPHYSFS_BUILD_STATIC=ON +else +PHYSFS_CONF_OPTS += -DPHYSFS_BUILD_STATIC=OFF +endif + +$(eval $(cmake-package))