| 1 |
jlec 13/10/30 17:36:56 |
| 2 |
|
| 3 |
Added: pspp-0.8.1-oos.patch pspp-0.8.1-underlinking.patch |
| 4 |
Log: |
| 5 |
sci-mathematics/pspp: Fix underlinking and out-of-source build |
| 6 |
|
| 7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-mathematics/pspp/files/pspp-0.8.1-oos.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/pspp/files/pspp-0.8.1-oos.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/pspp/files/pspp-0.8.1-oos.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: pspp-0.8.1-oos.patch |
| 16 |
=================================================================== |
| 17 |
src/ui/gui/automake.mk | 8 ++++---- |
| 18 |
1 file changed, 4 insertions(+), 4 deletions(-) |
| 19 |
|
| 20 |
diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk |
| 21 |
index 47a3215..24f5b0b 100644 |
| 22 |
--- a/src/ui/gui/automake.mk |
| 23 |
+++ b/src/ui/gui/automake.mk |
| 24 |
@@ -333,16 +333,16 @@ PHONY += yelp-check |
| 25 |
AM_CPPFLAGS += -Isrc |
| 26 |
|
| 27 |
src/ui/gui/pspp.desktop: src/ui/gui/gen-dot-desktop.sh $(POFILES) |
| 28 |
- POFILES="$(POFILES)" top_builddir="$(top_builddir)" $(SHELL) $< > $@ |
| 29 |
+ POFILES="$(POFILES)" top_builddir="$(top_builddir)" $(SHELL) $< > ${top_srcdir}/$@ |
| 30 |
|
| 31 |
CLEANFILES+=src/ui/gui/pspp.desktop |
| 32 |
|
| 33 |
src/ui/gui/psppire-marshal.c: src/ui/gui/marshaller-list |
| 34 |
- echo '#include <config.h>' > $@ |
| 35 |
- $(GLIB_GENMARSHAL) --body --prefix=psppire_marshal $? >> $@ |
| 36 |
+ echo '#include <config.h>' > ${top_srcdir}/$@ |
| 37 |
+ $(GLIB_GENMARSHAL) --body --prefix=psppire_marshal $? >> ${top_srcdir}/$@ |
| 38 |
|
| 39 |
src/ui/gui/psppire-marshal.h: src/ui/gui/marshaller-list |
| 40 |
- $(GLIB_GENMARSHAL) --header --prefix=psppire_marshal $? > $@ |
| 41 |
+ $(GLIB_GENMARSHAL) --header --prefix=psppire_marshal $? > ${top_srcdir}/$@ |
| 42 |
|
| 43 |
desktopdir = $(datadir)/applications |
| 44 |
desktop_DATA = src/ui/gui/pspp.desktop |
| 45 |
|
| 46 |
|
| 47 |
|
| 48 |
1.1 sci-mathematics/pspp/files/pspp-0.8.1-underlinking.patch |
| 49 |
|
| 50 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/pspp/files/pspp-0.8.1-underlinking.patch?rev=1.1&view=markup |
| 51 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/pspp/files/pspp-0.8.1-underlinking.patch?rev=1.1&content-type=text/plain |
| 52 |
|
| 53 |
Index: pspp-0.8.1-underlinking.patch |
| 54 |
=================================================================== |
| 55 |
src/automake.mk | 5 +++-- |
| 56 |
1 file changed, 3 insertions(+), 2 deletions(-) |
| 57 |
|
| 58 |
diff --git a/src/automake.mk b/src/automake.mk |
| 59 |
index 73ff813..8524000 100644 |
| 60 |
--- a/src/automake.mk |
| 61 |
+++ b/src/automake.mk |
| 62 |
@@ -20,7 +20,7 @@ src_libpspp_core_la_LIBADD = \ |
| 63 |
src/data/libdata.la \ |
| 64 |
src/libpspp/liblibpspp.la \ |
| 65 |
$(LIBXML2_LIBS) $(PG_LIBS) \ |
| 66 |
- gl/libgl.la |
| 67 |
+ gl/libgl.la $(CAIRO_LIBS) |
| 68 |
|
| 69 |
src_libpspp_la_SOURCES = |
| 70 |
|
| 71 |
@@ -28,10 +28,11 @@ src_libpspp_la_CFLAGS = $(GSL_CFLAGS) |
| 72 |
src_libpspp_la_LDFLAGS = -release $(VERSION) |
| 73 |
|
| 74 |
src_libpspp_la_LIBADD = \ |
| 75 |
+ src/libpspp-core.la \ |
| 76 |
src/language/liblanguage.la \ |
| 77 |
src/math/libpspp-math.la \ |
| 78 |
src/output/liboutput.la \ |
| 79 |
- $(GSL_LIBS) |
| 80 |
+ $(GSL_LIBS) $(CAIRO_LIBS) $(LIBXML2_LIBS) |
| 81 |
|
| 82 |
include $(top_srcdir)/src/math/automake.mk |
| 83 |
include $(top_srcdir)/src/output/automake.mk |
Archives