[fpga-icestorm] 02/07: Refreshed patches
Ruben Undheim
rubund-guest at moszumanska.debian.org
Fri Oct 7 19:52:12 UTC 2016
This is an automated email from the git hooks/post-receive script.
rubund-guest pushed a commit to branch master
in repository fpga-icestorm.
commit bec4b08349a9d0ae14adba1eb94e242bb5932d8d
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date: Sun Sep 18 12:20:47 2016 +0200
Refreshed patches
---
debian/patches/01_installpath.patch | 28 +++++++---
debian/patches/02_spelling_fixes.patch | 73 ---------------------------
debian/patches/03_cxxflags.patch | 48 ++++++++++--------
debian/patches/fix_spelling_in_binaries.patch | 41 ---------------
debian/patches/override-CXX.patch | 21 --------
debian/patches/reproducible.patch | 2 +-
debian/patches/series | 3 --
7 files changed, 50 insertions(+), 166 deletions(-)
diff --git a/debian/patches/01_installpath.patch b/debian/patches/01_installpath.patch
index 3a5d52f..31b5db8 100644
--- a/debian/patches/01_installpath.patch
+++ b/debian/patches/01_installpath.patch
@@ -10,8 +10,8 @@ program other than icebox, so it should not be in the normal system-wide
python include path.
---
icebox/Makefile | 26 +++++++++++++-------------
- icetime/icetime.cc | 5 +----
- 2 files changed, 14 insertions(+), 17 deletions(-)
+ icetime/icetime.cc | 21 +--------------------
+ 2 files changed, 14 insertions(+), 33 deletions(-)
diff --git a/icebox/Makefile b/icebox/Makefile
index 43d4664..83796a1 100644
@@ -51,15 +51,31 @@ index 43d4664..83796a1 100644
uninstall:
rm -f $(DESTDIR)$(PREFIX)/bin/icebox.py
diff --git a/icetime/icetime.cc b/icetime/icetime.cc
-index fd7c898..ec070a3 100644
+index 252d820..c68b997 100644
--- a/icetime/icetime.cc
+++ b/icetime/icetime.cc
-@@ -266,10 +266,7 @@ void read_chipdb()
+@@ -276,26 +276,7 @@ void read_chipdb()
{
char buffer[1024];
-- if (PREFIX[0] == '~' && PREFIX[1] == '/')
-- snprintf(buffer, 1024, "%s%s/share/icebox/chipdb-%s.txt", getenv("HOME"), PREFIX+1, config_device.c_str());
+- if (PREFIX[0] == '~' && PREFIX[1] == '/') {
+- std::string homedir;
+-#ifdef _WIN32
+- if (getenv("USERPROFILE") != nullptr) {
+- homedir += getenv("USERPROFILE");
+- }
+- else {
+- if (getenv("HOMEDRIVE") != nullptr &&
+- getenv("HOMEPATH") != nullptr) {
+- homedir += getenv("HOMEDRIVE");
+- homedir += getenv("HOMEPATH");
+- }
+- }
+-#else
+- homedir += getenv("HOME");
+-#endif
+- snprintf(buffer, 1024, "%s%s/share/icebox/chipdb-%s.txt", homedir.c_str(), PREFIX+1, config_device.c_str());
+- }
- else
- snprintf(buffer, 1024, "%s/share/icebox/chipdb-%s.txt", PREFIX, config_device.c_str());
+ snprintf(buffer, 1024, "/usr/share/fpga-icestorm/chipdb/chipdb-%s.txt", config_device.c_str());
diff --git a/debian/patches/02_spelling_fixes.patch b/debian/patches/02_spelling_fixes.patch
deleted file mode 100644
index 80282ac..0000000
--- a/debian/patches/02_spelling_fixes.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From: Ruben Undheim <ruben.undheim at gmail.com>
-Date: Tue, 14 Jun 2016 18:46:08 +0200
-Subject: This patch fixes a few spelling mistakes in error output messages
-
----
- icepack/icepack.cc | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/icepack/icepack.cc b/icepack/icepack.cc
-index 6a9e05a..3b09936 100644
---- a/icepack/icepack.cc
-+++ b/icepack/icepack.cc
-@@ -328,7 +328,7 @@ void FpgaConfig::read_bits(std::istream &ifs)
- break;
-
- default:
-- error("Unkown command: 0x%02x 0x%02x\n", command, payload);
-+ error("Unknown command: 0x%02x 0x%02x\n", command, payload);
- }
- break;
-
-@@ -381,7 +381,7 @@ void FpgaConfig::read_bits(std::istream &ifs)
- break;
-
- default:
-- error("Unkown command: 0x%02x 0x%02x\n", command, payload);
-+ error("Unknown command: 0x%02x 0x%02x\n", command, payload);
- }
- }
-
-@@ -854,21 +854,21 @@ int FpgaConfig::chip_width() const
- {
- if (this->device == "1k") return 12;
- if (this->device == "8k") return 32;
-- panic("Unkown chip type '%s'.\n", this->device.c_str());
-+ panic("Unknown chip type '%s'.\n", this->device.c_str());
- }
-
- int FpgaConfig::chip_height() const
- {
- if (this->device == "1k") return 16;
- if (this->device == "8k") return 32;
-- panic("Unkown chip type '%s'.\n", this->device.c_str());
-+ panic("Unknown chip type '%s'.\n", this->device.c_str());
- }
-
- vector<int> FpgaConfig::chip_cols() const
- {
- if (this->device == "1k") return vector<int>({18, 54, 54, 42, 54, 54, 54});
- if (this->device == "8k") return vector<int>({18, 54, 54, 54, 54, 54, 54, 54, 42, 54, 54, 54, 54, 54, 54, 54, 54});
-- panic("Unkown chip type '%s'.\n", this->device.c_str());
-+ panic("Unknown chip type '%s'.\n", this->device.c_str());
- }
-
- string FpgaConfig::tile_type(int x, int y) const
-@@ -886,7 +886,7 @@ string FpgaConfig::tile_type(int x, int y) const
- return "logic";
- }
-
-- panic("Unkown chip type '%s'.\n", this->device.c_str());
-+ panic("Unknown chip type '%s'.\n", this->device.c_str());
- }
-
- int FpgaConfig::tile_width(const string &type) const
-@@ -896,7 +896,7 @@ int FpgaConfig::tile_width(const string &type) const
- if (type == "ramb") return 42;
- if (type == "ramt") return 42;
- if (type == "io") return 18;
-- panic("Unkown tile type '%s'.\n", type.c_str());
-+ panic("Unknown tile type '%s'.\n", type.c_str());
- }
-
- void FpgaConfig::cram_clear()
diff --git a/debian/patches/03_cxxflags.patch b/debian/patches/03_cxxflags.patch
index bb73b18..4315470 100644
--- a/debian/patches/03_cxxflags.patch
+++ b/debian/patches/03_cxxflags.patch
@@ -8,12 +8,12 @@ Subject: This makes sure that the CXXFLAGS given by the Debian build system
icemulti/Makefile | 2 +-
icepack/Makefile | 2 +-
icepll/Makefile | 2 +-
- iceprog/Makefile | 2 +-
+ iceprog/Makefile | 4 ++--
icetime/Makefile | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
+ 5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/icemulti/Makefile b/icemulti/Makefile
-index c901413..63c5715 100644
+index 009889e..5c4ceb7 100644
--- a/icemulti/Makefile
+++ b/icemulti/Makefile
@@ -1,6 +1,6 @@
@@ -22,10 +22,10 @@ index c901413..63c5715 100644
-CXXFLAGS = -MD -O0 -ggdb -Wall -std=c++11
+CXXFLAGS += -Wall -std=c++11
- all: icemulti$(EXE)
-
+ ifeq ($(STATIC),1)
+ LDFLAGS += -static
diff --git a/icepack/Makefile b/icepack/Makefile
-index 78701db..5bdb10b 100644
+index cfe48be..0d65562 100644
--- a/icepack/Makefile
+++ b/icepack/Makefile
@@ -1,6 +1,6 @@
@@ -35,9 +35,9 @@ index 78701db..5bdb10b 100644
+CXXFLAGS += -Wall -std=c++11
MXEGCC = /usr/local/src/mxe/usr/bin/i686-pc-mingw32-gcc
- all: icepack$(EXE) iceunpack$(EXE)
+ ifeq ($(STATIC),1)
diff --git a/icepll/Makefile b/icepll/Makefile
-index b47de3e..d746bf4 100644
+index e0badf6..3606093 100644
--- a/icepll/Makefile
+++ b/icepll/Makefile
@@ -1,6 +1,6 @@
@@ -46,22 +46,28 @@ index b47de3e..d746bf4 100644
-CXXFLAGS = -MD -O0 -ggdb -Wall -std=c++11 -I/usr/local/include
+CXXFLAGS += -Wall -std=c++11
- all: icepll$(EXE)
-
+ ifeq ($(STATIC),1)
+ LDFLAGS += -static
diff --git a/iceprog/Makefile b/iceprog/Makefile
-index b9f00d9..126a4e3 100644
+index 5614646..9209cc2 100644
--- a/iceprog/Makefile
+++ b/iceprog/Makefile
-@@ -1,6 +1,6 @@
- include ../config.mk
- LDLIBS = -L/usr/local/lib -lftdi -lm
--CFLAGS = -MD -O0 -ggdb -Wall -std=c99 -I/usr/local/include
-+CFLAGS += -Wall -std=c99
+@@ -2,11 +2,11 @@ include ../config.mk
+
+ ifneq ($(shell uname -s),Darwin)
+ LDLIBS = -L/usr/local/lib -lm
+- CFLAGS = -MD -O0 -ggdb -Wall -std=c99 -I/usr/local/include
++ CFLAGS += -Wall -std=c99 -I/usr/local/include
+ else
+ LIBFTDI_NAME = $(shell $(PKG_CONFIG) --exists libftdi1 && echo ftdi1 || echo ftdi)
+ LDLIBS = -L/usr/local/lib -l$(LIBFTDI_NAME) -lm
+- CFLAGS = -MD -O0 -ggdb -Wall -std=c99 -I/usr/local/include
++ CFLAGS += -Wall -std=c99 -I/usr/local/include
+ endif
- ifeq ($(MXE),1)
- LDLIBS += -lusb
+ ifeq ($(STATIC),1)
diff --git a/icetime/Makefile b/icetime/Makefile
-index 6355f06..3709a8b 100644
+index c56002b..22414df 100644
--- a/icetime/Makefile
+++ b/icetime/Makefile
@@ -1,6 +1,6 @@
@@ -70,5 +76,5 @@ index 6355f06..3709a8b 100644
-CXXFLAGS = -MD -O0 -ggdb -Wall -std=c++11 -I/usr/local/include -DPREFIX='"$(PREFIX)"'
+CXXFLAGS += -Wall -std=c++11 -DPREFIX='"$(PREFIX)"'
- all: icetime$(EXE)
-
+ ifeq ($(STATIC),1)
+ LDFLAGS += -static
diff --git a/debian/patches/fix_spelling_in_binaries.patch b/debian/patches/fix_spelling_in_binaries.patch
deleted file mode 100644
index 52bc373..0000000
--- a/debian/patches/fix_spelling_in_binaries.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Ruben Undheim <ruben.undheim at gmail.com>
-Date: Tue, 14 Jun 2016 18:46:08 +0200
-Subject: This patch fixes a few spelling errors detected by lintian
-
----
- icepll/icepll.cc | 4 ++--
- icetime/icetime.cc | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/icepll/icepll.cc b/icepll/icepll.cc
-index 261cf0a..7a3593d 100644
---- a/icepll/icepll.cc
-+++ b/icepll/icepll.cc
-@@ -84,12 +84,12 @@ int main(int argc, char **argv)
- int best_divq = 0;
-
- if (f_pllin < 10 || f_pllin > 133) {
-- fprintf(stderr, "Error: PLL input freqency %.3f MHz is outside range 10 MHz - 133 MHz!\n", f_pllin);
-+ fprintf(stderr, "Error: PLL input frequency %.3f MHz is outside range 10 MHz - 133 MHz!\n", f_pllin);
- exit(1);
- }
-
- if (f_pllout < 16 || f_pllout > 275) {
-- fprintf(stderr, "Error: PLL output freqency %.3f MHz is outside range 16 MHz - 275 MHz!\n", f_pllout);
-+ fprintf(stderr, "Error: PLL output frequency %.3f MHz is outside range 16 MHz - 275 MHz!\n", f_pllout);
- exit(1);
- }
-
-diff --git a/icetime/icetime.cc b/icetime/icetime.cc
-index ec070a3..0e194c2 100644
---- a/icetime/icetime.cc
-+++ b/icetime/icetime.cc
-@@ -1883,7 +1883,7 @@ int main(int argc, char **argv)
-
- if (device_type.empty()) {
- device_type = "lp" + config_device;
-- printf("// Warning: Missing -d paramter. Assuming '%s' device.\n", device_type.c_str());
-+ printf("// Warning: Missing -d parameter. Assuming '%s' device.\n", device_type.c_str());
- }
-
- if (device_type == "lp1k" || device_type == "hx1k") {
diff --git a/debian/patches/override-CXX.patch b/debian/patches/override-CXX.patch
deleted file mode 100644
index fff2628..0000000
--- a/debian/patches/override-CXX.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Sebastian Kuzminsky <seb at highlab.com>
-Date: Tue, 14 Jun 2016 18:46:08 +0200
-Subject: This patch makes sure that CXX and CC can be set by the package
- build system.
-
----
- config.mk | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/config.mk b/config.mk
-index 36c03c2..affb06a 100644
---- a/config.mk
-+++ b/config.mk
-@@ -1,5 +1,5 @@
--CXX = clang
--CC = $(CXX)
-+CXX ?= clang
-+CC ?= $(CXX)
- DESTDIR ?=
- PREFIX ?= /usr/local
-
diff --git a/debian/patches/reproducible.patch b/debian/patches/reproducible.patch
index 0de82a9..a838b9c 100644
--- a/debian/patches/reproducible.patch
+++ b/debian/patches/reproducible.patch
@@ -9,7 +9,7 @@ Last-Update: 2016-05-06
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/icebox/icebox_chipdb.py b/icebox/icebox_chipdb.py
-index 09a1ceb..0d54b46 100755
+index 8da3d7f..32fcd72 100755
--- a/icebox/icebox_chipdb.py
+++ b/icebox/icebox_chipdb.py
@@ -172,7 +172,7 @@ all_group_segments = ic.group_segments(all_tiles, connect_gb=False)
diff --git a/debian/patches/series b/debian/patches/series
index e512c55..f9f946d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,3 @@
01_installpath.patch
-02_spelling_fixes.patch
03_cxxflags.patch
-override-CXX.patch
-fix_spelling_in_binaries.patch
reproducible.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/fpga-icestorm.git
More information about the debian-science-commits
mailing list