On Wed, Apr 6, 2011 at 3:12 PM, Adam C Powell IV <hazel...@debian.org> wrote: > Hi Johannes, > > On Wed, 2011-04-06 at 14:37 +0200, Johannes Ring wrote: >> Hi Adam, >> >> On Wed, Apr 6, 2011 at 1:47 PM, Adam C Powell IV <hazel...@debian.org> wrote: >> > Just put a fix in alioth, let me know if it gives you trouble. I plan >> > to upload within 4-5 hours. >> >> Sorry, I tried your fix but it gives me trouble because libptscotch is >> linked against libscotch. This is the same problem as reported in >> #612621. > > Right, I'm sorry about that. I just copied the link commands from -4, > assuming that the changed CFLAGS and LDFLAGS would make the difference. > >> It seems like the build-fixes.patch does not incorporate the >> fixes from libptscotch.patch [1] in that bug report. Would you like me >> to create a new patch against the latest git repository? >> >> [1] >> http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=29;filename=libptscotch.patch;att=1;bug=612621 > > Sure, is there anything else that needs to change?
The attached patch fixes the problem for me. Thanks, Johannes
diff --git a/debian/patches/build-fixes.patch b/debian/patches/build-fixes.patch index 94ad82b..fa8ddc8 100644 --- a/debian/patches/build-fixes.patch +++ b/debian/patches/build-fixes.patch @@ -112,10 +112,10 @@ Index: scotch/src/libscotch/Makefile -libptscotch$(LIB) : $(LIBPTSCOTCHDEPS) $(LIBSCOTCHDEPS) - $(AR) $(ARFLAGS) $(@) $(?) -+libptscotch$(LIB) : $(LIBPTSCOTCHDEPS) $(LIBSCOTCHDEPS) libptscotcherr$(LIB) libscotch$(LIB) -+ $(CC) -shared -Wl,-soname,libptscotch-$(VERSION).so $(LIBPTSCOTCHDEPS) -L. -lptscotcherr -lscotch -lz -lpthread -lm -lrt -o libptscotch-$(VERSION).so ++libptscotch$(LIB) : $(LIBPTSCOTCHDEPS) $(LIBSCOTCHDEPS) libptscotcherr$(LIB) ++ $(CC) -shared -Wl,-soname,libptscotch-$(VERSION).so $(LIBPTSCOTCHDEPS) $(LIBSCOTCHDEPS) -L. -lptscotcherr -lz -lpthread -lm -lrt -o libptscotch-$(VERSION).so + ln -s libptscotch-$(VERSION).so libptscotch.so -+ $(AR) $(ARFLAGS) $(@) $(LIBPTSCOTCHDEPS) ++ $(AR) $(ARFLAGS) $(@) $(?) -$(RANLIB) $(@) -libscotch$(LIB) : $(LIBSCOTCHDEPS)
