commit OpenOffice_org-voikko for openSUSE:Factory
![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package OpenOffice_org-voikko for openSUSE:Factory checked in at Tue Jul 28 00:33:01 CEST 2009. -------- --- OpenOffice_org-voikko/OpenOffice_org-voikko.changes 2009-06-22 19:34:20.000000000 +0200 +++ OpenOffice_org-voikko/OpenOffice_org-voikko.changes 2009-07-27 20:15:39.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Jul 27 20:10:21 CEST 2009 - pmladek@suse.cz + +- changed the order of linker arguments to fix build in openSUSE Factory; + -Wl,--as-needed is enabled by default there (sf#2827973) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- openoffice.org-voikko-3.1-link-as-needed.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-voikko.spec ++++++ --- /var/tmp/diff_new_pack.UEYVxJ/_old 2009-07-28 00:32:50.000000000 +0200 +++ /var/tmp/diff_new_pack.UEYVxJ/_new 2009-07-28 00:32:50.000000000 +0200 @@ -22,12 +22,13 @@ BuildRequires: OpenOffice_org OpenOffice_org-sdk gcc-c++ java-devel libvoikko-devel unzip update-alternatives zip Summary: OpenOffice.org spellchecker/hyphenator for finnish language Version: 3.1 -Release: 2 +Release: 3 License: GPL Group: Productivity/Text/Spell PreReq: coreutils, grep Url: http://voikko.sourceforge.net Source: openoffice.org-voikko-%{version}.tar.bz2 +Patch: openoffice.org-voikko-3.1-link-as-needed.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -37,6 +38,7 @@ %prep %setup -q -n openoffice.org-voikko-%{version} +%patch %build . %{ooo3}/basis-link/sdk/setsdkenv_unix.sh ++++++ openoffice.org-voikko-3.1-link-as-needed.diff ++++++ --- Makefile +++ Makefile @@ -101,8 +101,12 @@ WARNING_FLAGS+= -fno-strict-aliasing endif endif -LINK_FLAGS=$(COMP_LINK_FLAGS) $(OPT_FLAGS) $(LINKER_FLAGS) $(LINK_LIBS) \ - $(SALLIB) $(CPPULIB) $(CPPUHELPERLIB) +# separated generic link flags and linked libs are needed to build with -Wl,--as-needed +# this flag has been enabled by default on openSUSE-11.2 +LINK_FLAGS=$(COMP_LINK_FLAGS) $(OPT_FLAGS) $(LINKER_FLAGS) +ifneq "$(PLATFORM)" "macosx" + LINK_LIBS+=$(SALLIB) $(CPPULIB) $(CPPUHELPERLIB) +endif VOIKKO_CC_FLAGS=$(OPT_FLAGS) $(WARNING_FLAGS) -Ibuild/hpp -I$(PRJ)/include/stl -I$(PRJ)/include ifdef STANDALONE_EXTENSION_PATH @@ -110,20 +114,20 @@ ifeq "$(PLATFORM)" "windows" STANDALONE_EXTENSION_FILES=mingwm10.dll libglib-2.0-0.dll malaga.dll \ libvoikko-1.dll - LINK_FLAGS += -lvoikko + LINK_LIBS += -lvoikko else ifeq "$(PLATFORM)" "macosx" STANDALONE_EXTENSION_FILES=1 else STANDALONE_EXTENSION_FILES=libmalaga.so.7 libvoikko.so.1 \ voikko-fi_FI.pro voikko-fi_FI.lex_l voikko-fi_FI.mor_l voikko-fi_FI.sym_l - LINK_FLAGS += -lvoikko + LINK_LIBS += -lvoikko endif endif else VOIKKO_CC_DEFINES= STANDALONE_EXTENSION_FILES= - LINK_FLAGS += -lvoikko + LINK_LIBS += -lvoikko endif ifndef ENABLE_GRAMMAR_CHECKER @@ -253,7 +257,7 @@ $(LIBVOIKKO_PATH)/lib/libintl.a -framework CoreFoundation -framework Carbon $(INSTALL_NAME_URELIBS) $@ else - $(LINK) $(LINK_FLAGS) -o $@ $^ + $(LINK) $(LINK_FLAGS) $^ -o $@ $(LINK_LIBS) endif endif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de