mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 09:49:18 -04:00
1: Fix build with newer zlib [1]
2: switch to gcc46. PR: ports/180748 Submitted by: John Marino <freebsd at marino.st> [1]
This commit is contained in:
parent
ef1ad06e55
commit
9d39f570f6
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=323810
3 changed files with 43 additions and 2 deletions
|
@ -38,7 +38,7 @@ LIB_DEPENDS+= gmp:${PORTSDIR}/math/gmp
|
||||||
|
|
||||||
.if ${OSVERSION} >= 900000
|
.if ${OSVERSION} >= 900000
|
||||||
# needs libobjc
|
# needs libobjc
|
||||||
GCCSUFFIX=42
|
GCCSUFFIX= 46
|
||||||
CC= gcc${GCCSUFFIX}
|
CC= gcc${GCCSUFFIX}
|
||||||
CXX= g++${GCCSUFFIX}
|
CXX= g++${GCCSUFFIX}
|
||||||
OFC_GCC_PORT?= lang/gcc${GCCSUFFIX}
|
OFC_GCC_PORT?= lang/gcc${GCCSUFFIX}
|
||||||
|
|
19
lang/ofc/files/patch-ofc_DGZipFile.h
Normal file
19
lang/ofc/files/patch-ofc_DGZipFile.h
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
--- ofc/DGZipFile.h.orig 2008-08-02 15:15:11.000000000 +0000
|
||||||
|
+++ ofc/DGZipFile.h
|
||||||
|
@@ -46,6 +46,7 @@
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef HAVE_DGZIPFILE
|
||||||
|
+#include <zlib.h>
|
||||||
|
|
||||||
|
// the seek origins
|
||||||
|
#define DGZ_SEEK_SET (0) // Seek from the start of the file
|
||||||
|
@@ -114,7 +115,7 @@
|
||||||
|
@interface DGZipFile : Object <DTextReadable,DTextWritable,DDataReadable,DDataWritable>
|
||||||
|
{
|
||||||
|
@private
|
||||||
|
- void *_file; // the file pointer
|
||||||
|
+ gzFile _file; // the file pointer
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
22
lang/ofc/files/patch-ofc_DGZipFile.m
Normal file
22
lang/ofc/files/patch-ofc_DGZipFile.m
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
--- ofc/DGZipFile.m.orig 2008-08-02 05:58:14.000000000 +0000
|
||||||
|
+++ ofc/DGZipFile.m
|
||||||
|
@@ -31,10 +31,6 @@
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
-#ifdef HAVE_DGZIPFILE
|
||||||
|
-#include <zlib.h>
|
||||||
|
-#endif
|
||||||
|
-
|
||||||
|
#include "ofc/DDatable.h"
|
||||||
|
|
||||||
|
|
||||||
|
@@ -123,7 +119,7 @@
|
||||||
|
@interface DGZipFile : Object <DTextReadable,DTextWritable,DDataReadable,DDataWritable>
|
||||||
|
{
|
||||||
|
@private
|
||||||
|
- void *_file; // the file pointer
|
||||||
|
+ gzFile _file; // the file pointer
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
Loading…
Add table
Reference in a new issue