cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix for gcc4

Browse Source
This commit is contained in:
espie 2010-05-23 10:27:46 +00:00
parent 84154e7171
commit 8a8304cf02
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
www/webkit/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.26 2010/05/17 20:16:09 ajacoutot Exp $ # $OpenBSD: Makefile,v 1.27 2010/05/23 10:27:46 espie Exp $
COMMENT = open source web browser engine COMMENT = open source web browser engine
@ -28,11 +28,17 @@ USE_GMAKE = Yes
USE_LIBTOOL = Yes USE_LIBTOOL = Yes
MODULES = converters/libiconv \ MODULES = converters/libiconv \
textproc/intltool \ textproc/intltool
gcc4
.include <bsd.own.mk>
.if ${COMPILER_VERSION:L:Mgcc4*}
STDCPPLIB = stdc++
.else
MODULES += gcc4
MODGCC4_ARCHES =* MODGCC4_ARCHES =*
MODGCC4_LANGS = c c++ MODGCC4_LANGS = c c++
STDCPPLIB = estdc++
.endif
CONFIGURE_STYLE = gnu CONFIGURE_STYLE = gnu
@ -41,6 +47,7 @@ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include -
ac_cv_path_FLEX=${LOCALBASE}/bin/gflex ac_cv_path_FLEX=${LOCALBASE}/bin/gflex
MAKE_FILE = GNUmakefile MAKE_FILE = GNUmakefile
MAKE_FLAGS = STDCPPLIB=${STDCPPLIB}
RUN_DEPENDS = ::multimedia/gstreamer-0.10/plugins-ffmpeg \ RUN_DEPENDS = ::multimedia/gstreamer-0.10/plugins-ffmpeg \
::multimedia/gstreamer-0.10/plugins-good ::multimedia/gstreamer-0.10/plugins-good

4
www/webkit/patches/patch-GNUmakefile_in
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-GNUmakefile_in,v 1.6 2010/04/22 13:37:00 landry Exp $ $OpenBSD: patch-GNUmakefile_in,v 1.7 2010/05/23 10:27:46 espie Exp $
install GtkLauncher, remove silent build lines, fix lpthread/pthread install GtkLauncher, remove silent build lines, fix lpthread/pthread
--- GNUmakefile.in.orig Mon Apr 5 14:55:24 2010 --- GNUmakefile.in.orig Mon Apr 5 14:55:24 2010
+++ GNUmakefile.in Wed Apr 21 15:32:34 2010 +++ GNUmakefile.in Wed Apr 21 15:32:34 2010
@ -82,7 +82,7 @@ install GtkLauncher, remove silent build lines, fix lpthread/pthread
libJavaScriptCore.la \ libJavaScriptCore.la \
-lm \ -lm \
- -lstdc++ - -lstdc++
+ -lestdc++ + -l${STDCPPLIB}
Programs_minidom_LDFLAGS = \ Programs_minidom_LDFLAGS = \
-no-install \ -no-install \