diff options
| author | mi <mi@FreeBSD.org> | 2012-05-18 03:38:12 +0800 |
|---|---|---|
| committer | mi <mi@FreeBSD.org> | 2012-05-18 03:38:12 +0800 |
| commit | e6d719470e8b653723da4805867acdc88c52cf2d (patch) | |
| tree | 92bcf65c2440b3b0c518ece2922913cc5468f0ca /devel | |
| parent | 9272fd2c74c2447f426403d33bcea17f48eb4793 (diff) | |
| download | freebsd-ports-gnome-e6d719470e8b653723da4805867acdc88c52cf2d.tar.gz freebsd-ports-gnome-e6d719470e8b653723da4805867acdc88c52cf2d.tar.zst freebsd-ports-gnome-e6d719470e8b653723da4805867acdc88c52cf2d.zip | |
Add a hunk to patch configure-script to not add any X11 libraries to
the linker-list explicitly, using only what QT4 libraries drag in
themselves.
In particular, this gets rid of dependency on -lXmu and -lXi, which
prevented the port from building in the "clean room" of tinderbox. No
revision bump, because the official package was failing to build anyway.
Reported by: pav@
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/subcommander2/files/patch-configure | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/devel/subcommander2/files/patch-configure b/devel/subcommander2/files/patch-configure index 3e9b0a12d9b2..2c0c9ed642a1 100644 --- a/devel/subcommander2/files/patch-configure +++ b/devel/subcommander2/files/patch-configure @@ -1,5 +1,5 @@ ---- configure.orig 2009-09-20 05:28:22.000000000 -0400 -+++ configure 2009-09-20 14:16:07.000000000 -0400 +--- configure 2009-09-28 17:29:14.000000000 -0400 ++++ configure 2012-05-17 15:32:33.000000000 -0400 @@ -4867,9 +4867,9 @@ goodsvn="bad"; elif test $SVN_MAJOR -eq 1 -a $SVN_MINOR -le 3; then @@ -53,3 +53,15 @@ QT_LIBS="-L$QT_LIBPATH -lQt3Support -lQtGui -lQtNetwork -lQtCore" ;; esac +@@ -6888,11 +6888,6 @@ + QT_INCLUDES="$QT_INCLUDES -I$x_includes" + fi + +- if test x$x_libraries != x; then +- QT_LIBS="$QT_LIBS -L$x_libraries $X_PRE_LIBS -lX11 -lXext -lXmu -lXt" +- QT_LIBS="$QT_LIBS -lXi $X_EXTRA_LIBS" +- fi +- + ;; + esac + |