diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-27 15:09:19 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-27 15:09:19 +0100 |
commit | b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf (patch) | |
tree | 220c385a8657d85bb6b305819a1842a3b1f4079c /pkgs/development/compilers/bluespec/libstp_stub_makefile.patch | |
parent | 977848375167f4671a03ccc0dbf5896f4cf0d3fe (diff) | |
parent | be36f6f0a0ffbeef228a021f5a343f5ce7a183de (diff) | |
download | nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.gz nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.bz2 nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.lz nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.xz nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.zst nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/compilers/bluespec/libstp_stub_makefile.patch')
-rw-r--r-- | pkgs/development/compilers/bluespec/libstp_stub_makefile.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/pkgs/development/compilers/bluespec/libstp_stub_makefile.patch b/pkgs/development/compilers/bluespec/libstp_stub_makefile.patch new file mode 100644 index 00000000000..c714afc670c --- /dev/null +++ b/pkgs/development/compilers/bluespec/libstp_stub_makefile.patch @@ -0,0 +1,28 @@ +diff -ru bsc-orig/src/vendor/stp/Makefile bsc-new/src/vendor/stp/Makefile +--- bsc-orig/src/vendor/stp/Makefile 1969-12-31 16:00:01.000000000 -0800 ++++ bsc-new/src/vendor/stp/Makefile 2020-11-12 17:42:40.115143035 -0800 +@@ -9,12 +9,13 @@ + SRC = src + else + SRC = src_stub ++SNAME += lib/libstp_stub.so + endif + + ifeq ($(OSTYPE), Darwin) +-SNAME=libstp.dylib ++SNAME = lib/libstp.dylib + else +-SNAME=libstp.so.1 ++SNAME += lib/libstp.so.1 + endif + + all: install +@@ -23,7 +24,7 @@ + $(MAKE) -C $(SRC) install + ln -fsn HaskellIfc include_hs + install -m 755 -d $(PREFIX)/lib/SAT +- install -m 644 lib/$(SNAME) $(PREFIX)/lib/SAT ++ install -m 644 $(SNAME) $(PREFIX)/lib/SAT + + clean: + $(MAKE) -C $(SRC) clean |