diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-09-26 05:41:02 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-09-26 05:41:02 +0800 |
| commit | 75adca7ef3947718d42a8d6f570a978484b69f46 (patch) | |
| tree | bde48564165f3e5ebf7e7db459e8c0a6dc085801 /www/webkit-gtk2 | |
| parent | 45e847b467d31aab421043e3b630390cf635a667 (diff) | |
| download | marcuscom-ports-75adca7ef3947718d42a8d6f570a978484b69f46.tar.gz marcuscom-ports-75adca7ef3947718d42a8d6f570a978484b69f46.tar.zst marcuscom-ports-75adca7ef3947718d42a8d6f570a978484b69f46.zip | |
Fix the non-static build problem with a slightly less greedy regex.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13023 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'www/webkit-gtk2')
| -rw-r--r-- | www/webkit-gtk2/Makefile | 7 | ||||
| -rw-r--r-- | www/webkit-gtk2/files/extra-patch-libtool | 13 |
2 files changed, 5 insertions, 15 deletions
diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile index cae225dd1..af32cd490 100644 --- a/www/webkit-gtk2/Makefile +++ b/www/webkit-gtk2/Makefile @@ -3,7 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/webkit-gtk2/Makefile,v 1.39 2009/09/24 08:58:38 kwm Exp $ +# $MCom: ports/www/webkit-gtk2/Makefile,v 1.40 2009/09/25 20:52:46 kwm Exp $ # PORTNAME= webkit @@ -70,7 +70,6 @@ CONFIGURE_ARGS+=--disable-debug CONFIGURE_ARGS+=--enable-static PLIST_SUB+= STATIC="" .else -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libtool PLIST_SUB+= STATIC="@comment " .endif @@ -79,5 +78,9 @@ post-patch: ${WRKSRC}/WebCore/plugins/PluginDatabase.cpp @${FIND} ${WRKSRC} -name GNUmakefile.* | ${XARGS} ${REINPLACE_CMD} -e \ 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' +.if !defined(WITH_STATIC) + @${REINPLACE_CMD} -e 's|^build_old_libs=yes|build_old_libs=no|' \ + ${WRKDIR}/gnome-libtool +.endif .include <bsd.port.post.mk> diff --git a/www/webkit-gtk2/files/extra-patch-libtool b/www/webkit-gtk2/files/extra-patch-libtool deleted file mode 100644 index bb8c49bf9..000000000 --- a/www/webkit-gtk2/files/extra-patch-libtool +++ /dev/null @@ -1,13 +0,0 @@ -Manual tell our libtool not to build static libs. - ---- ../gnome-libtool.orig 2009-09-25 21:59:02.000000000 +0200 -+++ ../gnome-libtool 2009-09-25 21:59:52.000000000 +0200 -@@ -55,7 +55,7 @@ OBJDUMP=objdump - build_libtool_libs=yes - - # Whether or not to build static libraries. --build_old_libs=yes -+build_old_libs=no - - # What type of objects to build. - pic_mode=default |