Date: Tue, 19 Feb 2013 15:48:24 +0000 (UTC) From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r312577 - in head/sysutils/flashrom: . files Message-ID: <201302191548.r1JFmOLh060088@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Tue Feb 19 15:48:23 2013 New Revision: 312577 URL: http://svnweb.freebsd.org/changeset/ports/312577 Log: - Fix build with clang by removing duplicate const specifiers - While at it, get rid of useless PTHREAD_CFLAGS / PTHREAD_LIBS Added: head/sysutils/flashrom/files/ head/sysutils/flashrom/files/patch-duplicate-const (contents, props changed) Modified: head/sysutils/flashrom/Makefile Modified: head/sysutils/flashrom/Makefile ============================================================================== --- head/sysutils/flashrom/Makefile Tue Feb 19 15:47:41 2013 (r312576) +++ head/sysutils/flashrom/Makefile Tue Feb 19 15:48:23 2013 (r312577) @@ -26,8 +26,8 @@ FTDI_DESC= Enable external FT2232SPI fla USE_BZIP2= yes USE_GMAKE= yes -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lc +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -lc ONLY_FOR_ARCHS= amd64 i386 Added: head/sysutils/flashrom/files/patch-duplicate-const ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/flashrom/files/patch-duplicate-const Tue Feb 19 15:48:23 2013 (r312577) @@ -0,0 +1,64 @@ +--- ichspi.c.orig 2013-02-19 16:43:01.000000000 +0100 ++++ ichspi.c 2013-02-19 16:43:12.000000000 +0100 +@@ -1127,7 +1127,7 @@ + static uint32_t ich_hwseq_get_erase_block_size(unsigned int addr) + { + uint8_t enc_berase; +- static const uint32_t const dec_berase[4] = { ++ static uint32_t const dec_berase[4] = { + 256, + 4 * 1024, + 8 * 1024, +--- bitbang_spi.c.orig 2013-02-19 16:45:02.000000000 +0100 ++++ bitbang_spi.c 2013-02-19 16:45:34.000000000 +0100 +@@ -26,33 +26,33 @@ + #include "spi.h" + + /* Note that CS# is active low, so val=0 means the chip is active. */ +-static void bitbang_spi_set_cs(const const struct bitbang_spi_master *master, int val) ++static void bitbang_spi_set_cs(const struct bitbang_spi_master *master, int val) + { + master->set_cs(val); + } + +-static void bitbang_spi_set_sck(const const struct bitbang_spi_master *master, int val) ++static void bitbang_spi_set_sck(const struct bitbang_spi_master *master, int val) + { + master->set_sck(val); + } + +-static void bitbang_spi_set_mosi(const const struct bitbang_spi_master *master, int val) ++static void bitbang_spi_set_mosi(const struct bitbang_spi_master *master, int val) + { + master->set_mosi(val); + } + +-static int bitbang_spi_get_miso(const const struct bitbang_spi_master *master) ++static int bitbang_spi_get_miso(const struct bitbang_spi_master *master) + { + return master->get_miso(); + } + +-static void bitbang_spi_request_bus(const const struct bitbang_spi_master *master) ++static void bitbang_spi_request_bus(const struct bitbang_spi_master *master) + { + if (master->request_bus) + master->request_bus(); + } + +-static void bitbang_spi_release_bus(const const struct bitbang_spi_master *master) ++static void bitbang_spi_release_bus(const struct bitbang_spi_master *master) + { + if (master->release_bus) + master->release_bus(); +--- dummyflasher.c.orig 2013-02-19 16:45:38.000000000 +0100 ++++ dummyflasher.c 2013-02-19 16:45:49.000000000 +0100 +@@ -66,7 +66,7 @@ + static uint8_t emu_status = 0; + + /* A legit complete SFDP table based on the MX25L6436E (rev. 1.8) datasheet. */ +-static const uint8_t const sfdp_table[] = { ++static uint8_t const sfdp_table[] = { + 0x53, 0x46, 0x44, 0x50, // @0x00: SFDP signature + 0x00, 0x01, 0x01, 0xFF, // @0x04: revision 1.0, 2 headers + 0x00, 0x00, 0x01, 0x09, // @0x08: JEDEC SFDP header rev. 1.0, 9 DW long
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302191548.r1JFmOLh060088>