summaryrefslogtreecommitdiff
path: root/devel/openocd
diff options
context:
space:
mode:
authorjoerg <joerg>2015-10-07 23:14:47 +0000
committerjoerg <joerg>2015-10-07 23:14:47 +0000
commit1afa436256dd96f901d92807fef6a5f76f941855 (patch)
tree0e354c6ba9e1e31b7e130bfd10b7b268ef7e269a /devel/openocd
parente3e683acb3910eda2ea3b2896d13eb889569d4e5 (diff)
downloadpkgsrc-1afa436256dd96f901d92807fef6a5f76f941855.tar.gz
Remove a tautologic check to unbreak build with clang.
Diffstat (limited to 'devel/openocd')
-rw-r--r--devel/openocd/distinfo3
-rw-r--r--devel/openocd/patches/patch-src_flash_nor_sim3x.c24
2 files changed, 26 insertions, 1 deletions
diff --git a/devel/openocd/distinfo b/devel/openocd/distinfo
index 2454581903c..f002c4b76e5 100644
--- a/devel/openocd/distinfo
+++ b/devel/openocd/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2015/10/01 23:06:37 rodent Exp $
+$NetBSD: distinfo,v 1.4 2015/10/07 23:14:47 joerg Exp $
SHA1 (openocd-0.9.0.tar.bz2) = bcf99bb21f09513065b2c9ece148ace7d16cdd0c
RMD160 (openocd-0.9.0.tar.bz2) = 21b3c2d80fbf8707644f37e61142d7cccaa8fed0
Size (openocd-0.9.0.tar.bz2) = 3873090 bytes
+SHA1 (patch-src_flash_nor_sim3x.c) = 9c106fabf794196962a29af2196c2354db83ceb5
diff --git a/devel/openocd/patches/patch-src_flash_nor_sim3x.c b/devel/openocd/patches/patch-src_flash_nor_sim3x.c
new file mode 100644
index 00000000000..24960989955
--- /dev/null
+++ b/devel/openocd/patches/patch-src_flash_nor_sim3x.c
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_flash_nor_sim3x.c,v 1.1 2015/10/07 23:14:47 joerg Exp $
+
+--- src/flash/nor/sim3x.c.orig 2015-10-07 23:01:45.000000000 +0000
++++ src/flash/nor/sim3x.c
+@@ -864,14 +864,12 @@ static int sim3x_flash_info(struct flash
+ return ERROR_BUF_TOO_SMALL;
+
+ /* Package */
+- if (sim3x_info->device_package) {
+- printed = snprintf(buf, buf_size, "-G%s", sim3x_info->device_package);
+- buf += printed;
+- buf_size -= printed;
++ printed = snprintf(buf, buf_size, "-G%s", sim3x_info->device_package);
++ buf += printed;
++ buf_size -= printed;
+
+- if (buf_size <= 0)
+- return ERROR_BUF_TOO_SMALL;
+- }
++ if (buf_size <= 0)
++ return ERROR_BUF_TOO_SMALL;
+ }
+ }
+