mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-15 03:14:23 +00:00
Code Issues Releases Activity

- unbreak on amd64 <9 by depending on GCC 4.4+

Browse Source 
- i386 remains broken, for now
This commit is contained in:
Pietro Cerutti 2012-06-20 15:23:57 +00:00
parent 223d9523bf
commit 8e529b0fa0
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=299692
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
x11-toolkits/fox17/Makefile
View File

@ -15,7 +15,7 @@ MASTER_SITES= http://ftp.fox-toolkit.org/pub/ \
MAINTAINER= gahr@FreeBSD.org
COMMENT= Fast and extensive C++ GUI toolkit -- devel version
LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft
LIB_DEPENDS= Xft:${PORTSDIR}/x11-fonts/libXft
CONFLICTS= fox-1.4.* fox-1.6.*
@ -30,6 +30,7 @@ MAJORVER= ${PORTVERSION:R}
PLIST_SUB+= MAJORVER=${MAJORVER}
DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${MAJORVER}
USE_GCC= 4.4+
USE_GL= glut
USE_GNOME= gnomehack
USE_LDCONFIG= yes
@ -52,7 +53,7 @@ BROKEN= does not build
.if defined(WITHOUT_JPEG)
CONFIGURE_ARGS+=--disable-jpeg
.else
LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg
LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg
.endif
.if defined(WITHOUT_PNG)
@ -64,18 +65,15 @@ LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
.if defined(WITHOUT_TIFF)
CONFIGURE_ARGS+=--disable-tiff
.else
LIB_DEPENDS+= tiff.4:${PORTSDIR}/graphics/tiff
LIB_DEPENDS+= tiff:${PORTSDIR}/graphics/tiff
.endif
.if defined(WITHOUT_WEBP)
CONFIGURE_ARGS+=--disable-webp
.else
LIB_DEPENDS+= webp.2:${PORTSDIR}/graphics/webp
LIB_DEPENDS+= webp:${PORTSDIR}/graphics/webp
.endif
.if ${ARCH} == "amd64" && ${OSVERSION} < 900000
BROKEN= does not build on amd64
.endif
.if ${ARCH} == "powerpc"
BROKEN= Does not link on powerpc
.endif

11
x11-toolkits/fox17/files/patch-lib_FXAtomic.cpp Normal file
View File

@ -0,0 +1,11 @@
--- lib/FXAtomic.cpp.orig 2012-04-27 18:46:09.000000000 +0200
+++ lib/FXAtomic.cpp 2012-06-20 10:39:15.000000000 +0200
@@ -298,7 +298,7 @@
LONGLONG duet[2]={(LONGLONG)a,(LONGLONG)b};
return (_InterlockedCompareExchange128((LONGLONG volatile*)ptr,(LONGLONG)cmpb,(LONGLONG)cmpa,duet));
#elif (defined(HAVE_INLINE_ASSEMBLY) && defined(__i386__))
-#if (defined(__PIC__) || defined(__PIE__)
+#if defined(__PIC__) || defined(__PIE__)
register FXbool ret;
__asm__ __volatile__ ("xchgl %%esi, %%ebx\n\t"
"lock\n\t"