diff options
author | root <root@rshg054.dnsready.net> | 2012-02-06 23:14:50 +0000 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2012-02-06 23:14:50 +0000 |
commit | 1fa6edfba8d1e31ca1c0d59e8202cd3c62ccf393 (patch) | |
tree | 8d7ccc2dc9d08a4c3cde26aa01c887e9a0fc2fa1 /extra/celestia/celestia-1.6.1-linking.patch | |
parent | bdb5b3e66f6afa586ea147f69af5e4ba388f7615 (diff) |
Mon Feb 6 23:14:50 UTC 2012
Diffstat (limited to 'extra/celestia/celestia-1.6.1-linking.patch')
-rw-r--r-- | extra/celestia/celestia-1.6.1-linking.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/extra/celestia/celestia-1.6.1-linking.patch b/extra/celestia/celestia-1.6.1-linking.patch new file mode 100644 index 000000000..d610d5243 --- /dev/null +++ b/extra/celestia/celestia-1.6.1-linking.patch @@ -0,0 +1,54 @@ +Fix linking issues: + * underlinking GLUT (bug #372123, #387609) + * as-needed (bug #281258) + +--- a/src/celestia/Makefile.am ++++ b/src/celestia/Makefile.am +@@ -7,14 +7,15 @@ + + if ENABLE_KDE + SUBDIRS += kde +-celestiaKDELIBS = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) \ +- $(LIBSOCKET) -lDCOP kde/libkdegui.a ++celestiaKDELIBS = kde/libkdegui.a + celestia_LDFLAGS = $(all_libraries) $(KDE_RPATH) ++LIBS += $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) $(LIBSOCKET) -lDCOP + endif + + if ENABLE_GTK + SUBDIRS += gtk +-celestiaGTKLIBS = $(GTK_LIBS) gtk/libgtkgui.a ++celestiaGTKLIBS = gtk/libgtkgui.a ++LIBS += $(GTK_LIBS) + endif + + COMMONSOURCES = \ +@@ -62,6 +63,7 @@ + + if ENABLE_GLUT + GLUTSOURCES = glutmain.cpp ++GLUTLIBS = -lGL + endif + + if ENABLE_THEORA +@@ -80,15 +82,16 @@ + celestia_LDADD = \ + $(celestiaKDELIBS) \ + $(celestiaGTKLIBS) \ +- $(DL_LIBS) \ +- $(LUA_LIBS) \ +- $(THEORA_LIBS) \ + ../celengine/libcelengine.a \ + ../celtxf/libceltxf.a \ + ../cel3ds/libcel3ds.a \ + ../celmath/libcelmath.a \ + ../celutil/libcelutil.a \ +- $(SPICE_LIBS) ++ $(LUA_LIBS) \ ++ $(THEORA_LIBS) \ ++ $(GLUTLIBS) \ ++ $(SPICE_LIBS) \ ++ $(DL_LIBS) + + noinst_HEADERS = $(wildcard *.h) + noinst_DATA = ../../celestia |