| 1 |
xarthisius 11/11/01 08:13:01 |
| 2 |
|
| 3 |
Added: celestia-1.6.1-linking.patch |
| 4 |
Removed: celestia-1.6.1-as-needed.patch |
| 5 |
celestia-1.6.1-gold.patch |
| 6 |
celestia-1.6.1-underlinking.patch |
| 7 |
Log: |
| 8 |
Combine all patches fixing linking issues into one |
| 9 |
|
| 10 |
(Portage version: 2.2.0_alpha72/cvs/Linux x86_64) |
| 11 |
|
| 12 |
Revision Changes Path |
| 13 |
1.1 sci-astronomy/celestia/files/celestia-1.6.1-linking.patch |
| 14 |
|
| 15 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-astronomy/celestia/files/celestia-1.6.1-linking.patch?rev=1.1&view=markup |
| 16 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-astronomy/celestia/files/celestia-1.6.1-linking.patch?rev=1.1&content-type=text/plain |
| 17 |
|
| 18 |
Index: celestia-1.6.1-linking.patch |
| 19 |
=================================================================== |
| 20 |
Fix linking issues: |
| 21 |
* underlinking GLUT (bug #372123, #387609) |
| 22 |
* as-needed (bug #281258) |
| 23 |
|
| 24 |
--- a/src/celestia/Makefile.am |
| 25 |
+++ b/src/celestia/Makefile.am |
| 26 |
@@ -7,14 +7,15 @@ |
| 27 |
|
| 28 |
if ENABLE_KDE |
| 29 |
SUBDIRS += kde |
| 30 |
-celestiaKDELIBS = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) \ |
| 31 |
- $(LIBSOCKET) -lDCOP kde/libkdegui.a |
| 32 |
+celestiaKDELIBS = kde/libkdegui.a |
| 33 |
celestia_LDFLAGS = $(all_libraries) $(KDE_RPATH) |
| 34 |
+LIBS += $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) $(LIBSOCKET) -lDCOP |
| 35 |
endif |
| 36 |
|
| 37 |
if ENABLE_GTK |
| 38 |
SUBDIRS += gtk |
| 39 |
-celestiaGTKLIBS = $(GTK_LIBS) gtk/libgtkgui.a |
| 40 |
+celestiaGTKLIBS = gtk/libgtkgui.a |
| 41 |
+LIBS += $(GTK_LIBS) |
| 42 |
endif |
| 43 |
|
| 44 |
COMMONSOURCES = \ |
| 45 |
@@ -62,6 +63,7 @@ |
| 46 |
|
| 47 |
if ENABLE_GLUT |
| 48 |
GLUTSOURCES = glutmain.cpp |
| 49 |
+GLUTLIBS = -lGL |
| 50 |
endif |
| 51 |
|
| 52 |
if ENABLE_THEORA |
| 53 |
@@ -80,15 +82,16 @@ |
| 54 |
celestia_LDADD = \ |
| 55 |
$(celestiaKDELIBS) \ |
| 56 |
$(celestiaGTKLIBS) \ |
| 57 |
- $(DL_LIBS) \ |
| 58 |
- $(LUA_LIBS) \ |
| 59 |
- $(THEORA_LIBS) \ |
| 60 |
../celengine/libcelengine.a \ |
| 61 |
../celtxf/libceltxf.a \ |
| 62 |
../cel3ds/libcel3ds.a \ |
| 63 |
../celmath/libcelmath.a \ |
| 64 |
../celutil/libcelutil.a \ |
| 65 |
- $(SPICE_LIBS) |
| 66 |
+ $(LUA_LIBS) \ |
| 67 |
+ $(THEORA_LIBS) \ |
| 68 |
+ $(GLUTLIBS) \ |
| 69 |
+ $(SPICE_LIBS) \ |
| 70 |
+ $(DL_LIBS) |
| 71 |
|
| 72 |
noinst_HEADERS = $(wildcard *.h) |
| 73 |
noinst_DATA = ../../celestia |
Archives