uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
|
|
@ -0,0 +1,46 @@
|
|||
From 0f48e046f44624f4d4d8255ac5bd26397a38f16c Mon Sep 17 00:00:00 2001
|
||||
From: Keshav Kini <keshav.kini@gmail.com>
|
||||
Date: Sun, 23 Feb 2020 14:09:30 -0800
|
||||
Subject: [PATCH] Support shared library build
|
||||
|
||||
Patch taken from [the ACL2 Books documentation][1].
|
||||
|
||||
- Add " -fPIC" to the CXXFLAGS to build position-independent code,
|
||||
required for shared libraries.
|
||||
|
||||
- Add the line "export CXXFLAGS" below the setting of CXXFLAGS, so that
|
||||
those flags apply to the recursive make of the core solver library.
|
||||
|
||||
- Fix a typo: replace the occurrence of "CXXLAGS" with "CXXFLAGS".
|
||||
|
||||
[1]: http://www.cs.utexas.edu/users/moore/acl2/v8-2/combined-manual/index.html?topic=IPASIR____BUILDING-AN-IPASIR-SOLVER-LIBRARY
|
||||
---
|
||||
makefile | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/makefile b/makefile
|
||||
index 07121de..4e85c4b 100755
|
||||
--- a/makefile
|
||||
+++ b/makefile
|
||||
@@ -29,7 +29,8 @@ TARGET=libipasir$(SIG).a
|
||||
|
||||
CXX=g++
|
||||
|
||||
-CXXFLAGS= -g -std=c++11 -Wall -DNDEBUG -O3
|
||||
+CXXFLAGS= -g -std=c++11 -Wall -DNDEBUG -O3 -fPIC
|
||||
+export CXXFLAGS
|
||||
|
||||
#-----------------------------------------------------------------------#
|
||||
#- REQUIRED TOP RULES --------------------------------------------------#
|
||||
@@ -67,7 +68,7 @@ libipasir$(SIG).a: .FORCE
|
||||
#-----------------------------------------------------------------------#
|
||||
|
||||
ipasir$(NAME)glue.o: ipasir$(NAME)glue.cc ipasir.h makefile
|
||||
- $(CXX) -g -std=c++11 $(CXXLAGS) \
|
||||
+ $(CXX) -g -std=c++11 $(CXXFLAGS) \
|
||||
-DVERSION=\"$(VERSION)\" \
|
||||
-I$(DIR) -I$(DIR)/core -c ipasir$(NAME)glue.cc
|
||||
|
||||
--
|
||||
2.23.1
|
||||
|
||||
|
|
@ -0,0 +1,41 @@
|
|||
{ lib, stdenv, fetchurl, zlib, unzip }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libipasirglucose4";
|
||||
# This library has no version number AFAICT (beyond generally being based on
|
||||
# Glucose 4.x), but it was submitted to the 2017 SAT competition so let's use
|
||||
# that as the version number, I guess.
|
||||
version = "2017";
|
||||
|
||||
libname = pname + stdenv.targetPlatform.extensions.sharedLibrary;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://baldur.iti.kit.edu/sat-competition-2017/solvers/incremental/glucose-ipasir.zip";
|
||||
sha256 = "0xchgady9vwdh8frmc8swz6va53igp2wj1y9sshd0g7549n87wdj";
|
||||
};
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
buildInputs = [ zlib ];
|
||||
|
||||
sourceRoot = "sat/glucose4";
|
||||
patches = [ ./0001-Support-shared-library-build.patch ];
|
||||
|
||||
makeFlags = [ "CXX=${stdenv.cc.targetPrefix}c++" ];
|
||||
|
||||
postBuild = ''
|
||||
$CXX -shared -o ${libname} \
|
||||
${if stdenv.cc.isClang then "" else "-Wl,-soname,${libname}"} \
|
||||
ipasirglucoseglue.o libipasirglucose4.a
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -D ${libname} $out/lib/${libname}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Shared library providing IPASIR interface to the Glucose SAT solver";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ kini ];
|
||||
};
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue