diff options
| author |   Alin Năstac <mrness@gentoo.org> | 2006-05-10 19:10:34 +0000 |
|---|---|---|
| committer | Alin Năstac <mrness@gentoo.org> | 2006-05-10 19:10:34 +0000 |
| commit | 5686e791fd036a00a8479db0c6cd11064f5134e5 (patch) | |
| tree | 704503bec89f228cb690821c821c3b9fa67b6e04 /net-libs/wvstreams/files | |
| parent | Unmasking newer goffice/gnumeric since it's properly handled now (diff) | |
| download | gentoo-2-5686e791fd036a00a8479db0c6cd11064f5134e5.tar.gz gentoo-2-5686e791fd036a00a8479db0c6cd11064f5134e5.tar.bz2 gentoo-2-5686e791fd036a00a8479db0c6cd11064f5134e5.zip | |
Remove tcltk USE flag and fix broken build on systems with --as-needed in their LDFLAGS (#132556)
(Portage version: 2203-svn)
Diffstat (limited to 'net-libs/wvstreams/files')
| -rw-r--r-- | net-libs/wvstreams/files/digest-wvstreams-4.2.2-r2 | 1 | ||||
| -rw-r--r-- | net-libs/wvstreams/files/wvstreams-4.2.2-as-needed.patch | 34 |
2 files changed, 35 insertions, 0 deletions
diff --git a/net-libs/wvstreams/files/digest-wvstreams-4.2.2-r2 b/net-libs/wvstreams/files/digest-wvstreams-4.2.2-r2 new file mode 100644 index 000000000000..2e9bdd6e87ec --- /dev/null +++ b/net-libs/wvstreams/files/digest-wvstreams-4.2.2-r2 @@ -0,0 +1 @@ +MD5 103230cb9926cb8f3f4d8dc8584f3b9c wvstreams-4.2.2.tar.gz 1269821 diff --git a/net-libs/wvstreams/files/wvstreams-4.2.2-as-needed.patch b/net-libs/wvstreams/files/wvstreams-4.2.2-as-needed.patch new file mode 100644 index 000000000000..99687ff01767 --- /dev/null +++ b/net-libs/wvstreams/files/wvstreams-4.2.2-as-needed.patch @@ -0,0 +1,34 @@ +--- wvstreams-4.2.2/configure.ac.orig 2006-05-07 13:28:59.000000000 +0200 ++++ wvstreams-4.2.2/configure.ac 2006-05-07 13:31:34.000000000 +0200 +@@ -517,16 +517,19 @@ + wv_cv_with_qt=no + CPPFLAGS_save="$CPPFLAGS" + LDFLAGS_save="$LDFLAGS" ++ LIBS_save="$LIBS" + for wv_qtdir in $with_qt $QTDIR $QT_SEARCH_PATH; do + eval wv_qtdir="$wv_qtdir" + CPPFLAGS="$CPPFLAGS_save -I$wv_qtdir/include -I$wv_qtdir/include/qt3" +- LDFLAGS="$LDFLAGS_save -L$wv_qtdir/lib -lqt-mt" ++ LDFLAGS="$LDFLAGS_save -L$wv_qtdir/lib" ++ LIBS="$LIBS_save -lqt-mt" + AC_TRY_LINK([#include <qstring.h>], + [QString x("hello"); return 0; ], + [wv_cv_with_qt=$wv_qtdir; break]) + done + CPPFLAGS="$CPPFLAGS_save" + LDFLAGS="$LDFLAGS_save" ++ LIBS="$LIBS_save" + ]) + with_qt=$wv_cv_with_qt + if test "$with_qt" != no; then +--- wvstreams-4.2.2/wvrules.mk.orig 2006-05-07 13:39:44.000000000 +0200 ++++ wvstreams-4.2.2/wvrules.mk 2006-05-07 13:41:02.000000000 +0200 +@@ -272,7 +272,7 @@ + %.so: SONAME=$@$(if $(SO_VERSION),.$(SO_VERSION)) + wvsoname=$(if $($1-SONAME),$($1-SONAME),$(if $(SONAME),$(SONAME),$1)) + define wvlink_so +- $(LINK_MSG)$(WVLINK_CC) $(LDFLAGS) $($1-LDFLAGS) -Wl,-soname,$(call wvsoname,$1) -shared -o $1 $(filter %.o %.a %.so,$2) $($1-LIBS) $(LIBS) $(XX_LIBS) ++ $(LINK_MSG)$(WVLINK_CC) $(LDFLAGS) $($1-LDFLAGS) -Wl,-soname,$(call wvsoname,$1) -shared -o $1 $(filter %.o %.a,$2) $(filter %.so,$2) $($1-LIBS) $(LIBS) $(XX_LIBS) + $(if $(filter-out $(call wvsoname,$1),$1),$(call wvlns,$1,$(call wvsoname,$1))) + endef + |