diff options
| author | rodent <rodent> | 2015-04-23 12:21:19 +0000 |
|---|---|---|
| committer | rodent <rodent> | 2015-04-23 12:21:19 +0000 |
| commit | f907c094c1c37522322dac1c0c4a6fdfdd62c645 (patch) | |
| tree | da0bd71300116e2b64bbc54023148ed1486e3fb1 /devel/openocd | |
| parent | 7a6a47bdfa27448c68f1f36845c4497bd645878d (diff) | |
| download | pkgsrc-f907c094c1c37522322dac1c0c4a6fdfdd62c645.tar.gz | |
"Remove useless checks causing build failure with clang". --upstream
Diffstat (limited to 'devel/openocd')
| -rw-r--r-- | devel/openocd/distinfo | 4 | ||||
| -rw-r--r-- | devel/openocd/patches/patch-src_jtag_drivers_ulink.c | 16 | ||||
| -rw-r--r-- | devel/openocd/patches/patch-src_jtag_drivers_usb__blaster_ublast2__access__libusb.c | 16 |
3 files changed, 35 insertions, 1 deletions
diff --git a/devel/openocd/distinfo b/devel/openocd/distinfo index a2069e3a5c8..243dc23f415 100644 --- a/devel/openocd/distinfo +++ b/devel/openocd/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.1 2015/04/04 00:26:42 rodent Exp $ +$NetBSD: distinfo,v 1.2 2015/04/23 12:21:19 rodent Exp $ SHA1 (openocd-0.8.0.tar.bz2) = 10bf9eeb54e03083cb1a101785b2d69fbdf18f31 RMD160 (openocd-0.8.0.tar.bz2) = 812755bb51ccf6bb11e4b6aac6dd1c0c674c43b7 Size (openocd-0.8.0.tar.bz2) = 3768447 bytes +SHA1 (patch-src_jtag_drivers_ulink.c) = 373960ff40b4cd2b7a74e526595bf4ab9468beb3 +SHA1 (patch-src_jtag_drivers_usb__blaster_ublast2__access__libusb.c) = 5baff71502a7fc1121efd3d8d6de0bd72eae3832 diff --git a/devel/openocd/patches/patch-src_jtag_drivers_ulink.c b/devel/openocd/patches/patch-src_jtag_drivers_ulink.c new file mode 100644 index 00000000000..03df5ccefd9 --- /dev/null +++ b/devel/openocd/patches/patch-src_jtag_drivers_ulink.c @@ -0,0 +1,16 @@ +$NetBSD: patch-src_jtag_drivers_ulink.c,v 1.1 2015/04/23 12:21:19 rodent Exp $ + +"Remove useless checks causing build failure with clang". --upstream + +--- src/jtag/drivers/ulink.c.orig 2014-03-29 16:55:12.000000000 +0000 ++++ src/jtag/drivers/ulink.c +@@ -461,9 +461,6 @@ int ulink_write_firmware_section(struct + LOG_DEBUG("section %02i at addr 0x%04x (size 0x%04x)", section_index, addr, + size); + +- if (data == NULL) +- return ERROR_FAIL; +- + /* Copy section contents to local buffer */ + ret = image_read_section(firmware_image, section_index, 0, size, data, + &size_read); diff --git a/devel/openocd/patches/patch-src_jtag_drivers_usb__blaster_ublast2__access__libusb.c b/devel/openocd/patches/patch-src_jtag_drivers_usb__blaster_ublast2__access__libusb.c new file mode 100644 index 00000000000..aa3e8326025 --- /dev/null +++ b/devel/openocd/patches/patch-src_jtag_drivers_usb__blaster_ublast2__access__libusb.c @@ -0,0 +1,16 @@ +$NetBSD: patch-src_jtag_drivers_usb__blaster_ublast2__access__libusb.c,v 1.1 2015/04/23 12:21:19 rodent Exp $ + +"Remove useless checks causing build failure with clang". --upstream + +--- src/jtag/drivers/usb_blaster/ublast2_access_libusb.c.orig 2014-03-29 16:55:12.000000000 +0000 ++++ src/jtag/drivers/usb_blaster/ublast2_access_libusb.c +@@ -74,9 +74,6 @@ static int ublast2_write_firmware_sectio + LOG_DEBUG("section %02i at addr 0x%04x (size 0x%04x)", section_index, addr, + size); + +- if (data == NULL) +- return ERROR_FAIL; +- + /* Copy section contents to local buffer */ + int ret = image_read_section(firmware_image, section_index, 0, size, data, + &size_read); |