mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-23 04:23:08 +00:00
- Fix bug with mmap() on 8.x [1]
- Remove gcc 295, 32, 33, 40, and 40 support [2] - Bump PORTREVISION PR: ports/136971 [1] ports/136679 [2] Submitted by: Aragon Gouveia <aragon@phat.za.net> [1] Ulrich Spoerlein <uqs@spoerlein.net> [2] gerald [2]
This commit is contained in:
parent
e316a3ed4a
commit
ba71064e44
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=238939
@ -7,7 +7,7 @@
|
||||
|
||||
PORTNAME= ccache
|
||||
PORTVERSION= 2.4
|
||||
PORTREVISION= 8
|
||||
PORTREVISION= 9
|
||||
CATEGORIES= devel
|
||||
MASTER_SITES= http://samba.org/ftp/ccache/
|
||||
|
||||
@ -33,13 +33,10 @@ SUB_FILES= ${HOWTO} pkg-message
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
.if !defined(WITHOUT_COMPILER_LINKS)
|
||||
.if ${ARCH}=="i386" || ${ARCH}=="alpha"
|
||||
GNU_COMPILERS+= 295
|
||||
.endif
|
||||
.if ${ARCH}=="i386"
|
||||
CCACHE_COMPILERS+= icc icpc
|
||||
.endif
|
||||
GNU_COMPILERS+= 32 33 34 40 41 42 43 44 -ooo
|
||||
GNU_COMPILERS+= 34 42 43 44 -ooo
|
||||
CCACHE_COMPILERS+= cc c++ gcc g++ ${GNU_COMPILERS:S|^|gcc|} ${GNU_COMPILERS:S|^|g++|}
|
||||
.if defined(EXTRA_COMPILERS)
|
||||
CCACHE_COMPILERS+= ${EXTRA_COMPILERS}
|
||||
|
@ -17,8 +17,8 @@
|
||||
|
||||
void cc_log(const char *format, ...);
|
||||
void fatal(const char *msg);
|
||||
--- hash.c.orig Wed Sep 8 21:36:22 2004
|
||||
+++ hash.c Wed Sep 8 21:36:25 2004
|
||||
--- hash.c.orig 2004-09-13 12:38:30.000000000 +0200
|
||||
+++ hash.c 2009-07-21 23:37:00.000000000 +0200
|
||||
@@ -20,17 +20,22 @@
|
||||
*/
|
||||
|
||||
@ -46,7 +46,7 @@
|
||||
}
|
||||
|
||||
void hash_string(const char *s)
|
||||
@@ -46,35 +51,40 @@
|
||||
@@ -46,35 +51,44 @@
|
||||
/* add contents of a file to the hash */
|
||||
void hash_file(const char *fname)
|
||||
{
|
||||
@ -72,12 +72,16 @@
|
||||
+ close(fd);
|
||||
+ fatal(__FUNCTION__);
|
||||
+ }
|
||||
+ buf = mmap(NULL, stats.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
|
||||
+ if (buf == MAP_FAILED) {
|
||||
+ cc_log("Failed to mmap %s\n", fname);
|
||||
+ close(fd);
|
||||
+ fatal(__FUNCTION__);
|
||||
+ }
|
||||
+ if( stats.st_size == 0 )
|
||||
+ buf = NULL;
|
||||
+ else {
|
||||
+ buf = mmap(NULL, stats.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
|
||||
+ if (buf == MAP_FAILED) {
|
||||
+ cc_log("Failed to mmap %s\n", fname);
|
||||
+ close(fd);
|
||||
+ fatal(__FUNCTION__);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ hash_buffer(buf, stats.st_size);
|
||||
close(fd);
|
||||
|
Loading…
Reference in New Issue
Block a user