sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix build with gcc 4.2

Browse source 
- While we're here, replace manual ${LDCONFIG} command with ${USE_LDCONFIG}
This commit is contained in:
Johan van Selst 2007-10-12 08:31:11 +00:00
parent 528d9238c9
commit 8c2897a3fe
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=201354
2 changed files with 43 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
devel/entity/Makefile
View file

@ -24,18 +24,13 @@ CONFIGURE_ARGS+= --enable-tcl=no
USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
USE_GNOME= gtk12
USE_LDCONFIG= yes
USE_LDCONFIG= ${PREFIX}/lib/entity/clib
MAN1= entity.1
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 700042
BROKEN= Broken with gcc 4.2
.endif
post-install:
${LDCONFIG} -m ${PREFIX}/lib/entity/clib ${PREFIX}/lib
${MKDIR} ${PREFIX}/share/entity
cd ${WRKSRC}/apps && ${PAX} -r -w `${LS} | \
${GREP} -v Makefile` ${PREFIX}/share/entity

42
devel/entity/files/patch-libentitynjs_iostream.c Normal file
View file

@ -0,0 +1,42 @@
--- libentitynjs/iostream.c.orig 2007-10-12 10:20:45.000000000 +0200
+++ libentitynjs/iostream.c 2007-10-12 10:17:41.000000000 +0200
@@ -205,8 +205,9 @@ js_iostream_pipe (FILE *fp, int readp)
size_t
-js_iostream_read (JSIOStream *stream, void *ptr, size_t size)
+js_iostream_read (JSIOStream *stream, void *vptr, size_t size)
{
+ unsigned char *ptr = (unsigned char *)vptr;
size_t total = 0;
int got;
@@ -233,7 +234,7 @@ js_iostream_read (JSIOStream *stream, vo
stream->bufpos += got;
size -= got;
- (unsigned char *) ptr += got;
+ ptr += got;
total += got;
}
else
@@ -251,8 +252,9 @@ js_iostream_read (JSIOStream *stream, vo
size_t
-js_iostream_write (JSIOStream *stream, void *ptr, size_t size)
+js_iostream_write (JSIOStream *stream, void *vptr, size_t size)
{
+ unsigned char *ptr = (unsigned char *)vptr;
int space;
size_t total = 0;
@@ -290,7 +292,7 @@ js_iostream_write (JSIOStream *stream, v
stream->data_in_buf += space;
total += space;
size -= space;
- (unsigned char *) ptr += space;
+ ptr += space;
/* Now the buffer contains buffered write data. */
stream->writep = 1;