rpms/malaga/devel malaga-malshow-lm.patch, NONE, 1.1 malaga.spec, 1.9, 1.10

Ville-Pekka Vainio vpv at fedoraproject.org
Wed Feb 10 19:14:02 UTC 2010


Author: vpv

Update of /cvs/pkgs/rpms/malaga/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31539

Modified Files:
	malaga.spec 
Added Files:
	malaga-malshow-lm.patch 
Log Message:
* Wed Feb 10 2010 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 7.12-7
- Add patch to link malshow with -lm, hopefully fixes FTBFS caused by
  https://fedoraproject.org/wiki/Features/ChangeInImplicitDSOLinking


malaga-malshow-lm.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE malaga-malshow-lm.patch ---
diff -Naur malaga-7.12.orig/Makefile.in malaga-7.12/Makefile.in
--- malaga-7.12.orig/Makefile.in	2008-02-28 20:38:21.000000000 +0200
+++ malaga-7.12/Makefile.in	2010-02-10 20:59:54.506702713 +0200
@@ -243,7 +243,7 @@
 malshow: $(MALSHOW_OBJS) libmalaga.la
 	@echo "Linking malshow"
 	@$(LIBTOOL) --mode=link $(LINK) $(MALSHOW_OBJS) $(GTK_LIBS) \
-	  libmalaga.la -o malshow 
+	  -lm libmalaga.la -o malshow 
 
 # malsym ----------------------------------------------------------------------
 


Index: malaga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/malaga/devel/malaga.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- malaga.spec	16 Sep 2009 17:44:34 -0000	1.9
+++ malaga.spec	10 Feb 2010 19:14:02 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           malaga
 Version:        7.12 
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A programming language for automatic language analysis
 
 Group:          Development/Languages
@@ -12,6 +12,9 @@ Source0:        http://home.arcor.de/bjo
 # of problems won't probably come up. The only executables in Fedora which
 # link to libmalaga currently are the malaga tools.
 Patch0:         malaga-rename-map_file.diff
+# Malshow needs to be linked with -lm as Fedora's ld doesn't do implicit
+# linking anymore
+Patch1:         malaga-malshow-lm.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel readline-devel
@@ -50,6 +53,7 @@ Library files for %{name}.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 # Remove "@" marks so that the build process is more verbose
 sed -i.debug -e 's|^\([ \t][ \t]*\)@|\1|' Makefile.in
 # Remove "-s" so binaries won't be stripped
@@ -114,6 +118,10 @@ fi
 
 
 %changelog
+* Wed Feb 10 2010 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 7.12-7
+- Add patch to link malshow with -lm, hopefully fixes FTBFS caused by
+  https://fedoraproject.org/wiki/Features/ChangeInImplicitDSOLinking
+
 * Wed Sep 16 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 7.12-6
 - Remove rpath which was set for the malaga binaries in 64 bit architechtures
 



More information about the scm-commits mailing list